summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt17
-rw-r--r--actions/apigroupcreate.php8
-rw-r--r--actions/apigrouplistall.php10
-rw-r--r--actions/apistatusnetconfig.php2
-rw-r--r--actions/apitimelinegroup.php18
-rw-r--r--actions/apitimelineuser.php19
-rw-r--r--actions/blockedfromgroup.php9
-rw-r--r--actions/deleteuser.php31
-rw-r--r--actions/editgroup.php17
-rw-r--r--actions/foafgroup.php17
-rw-r--r--actions/groupdesignsettings.php5
-rw-r--r--actions/grouplogo.php5
-rw-r--r--actions/groupmembers.php9
-rw-r--r--actions/grouprss.php9
-rw-r--r--actions/groups.php18
-rw-r--r--actions/hcard.php120
-rw-r--r--actions/joingroup.php32
-rw-r--r--actions/leavegroup.php32
-rw-r--r--actions/newgroup.php10
-rw-r--r--actions/showgroup.php12
-rw-r--r--actions/subscribe.php2
-rw-r--r--actions/twitapisearchatom.php2
-rw-r--r--actions/twitapisearchjson.php1
-rw-r--r--actions/twitapitrends.php2
-rw-r--r--classes/Local_group.php46
-rw-r--r--classes/Notice.php38
-rw-r--r--classes/User_group.php131
-rw-r--r--classes/statusnet.ini34
-rw-r--r--db/beta5tobeta6.sql28
-rw-r--r--db/statusnet.sql15
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.auto.php11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.autoload.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.func.php23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.includes.php208
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.kses.php30
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.path.php11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.php237
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier.safe-includes.php202
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrCollections.php128
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef.php87
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php87
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php87
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php126
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php43
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php78
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php38
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php28
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php54
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php149
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php90
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php40
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php47
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php78
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php58
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php69
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php40
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php38
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php56
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php65
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php28
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php34
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php32
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php70
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php41
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php53
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php41
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php52
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php48
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php73
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php73
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php34
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php15
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php77
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php17
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php62
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php39
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php99
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform.php56
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php19
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php36
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php58
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php42
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php44
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php40
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php28
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php27
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php27
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php15
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php50
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrTypes.php77
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/AttrValidator.php162
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Bootstrap.php98
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/CSSDefinition.php292
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef.php48
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php48
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php90
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php20
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php26
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php117
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php88
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php142
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Config.php580
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema.php158
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php44
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php106
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php42
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php77
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php37
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php180
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php206
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php66
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.serbin12999 -> 0 bytes
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt19
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt5
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt31
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt15
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt46
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt13
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt28
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt17
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt15
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt7
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt13
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt19
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt34
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt29
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt74
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt22
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt19
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt20
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt33
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt16
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt20
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt24
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt8
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt13
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt25
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt7
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt15
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt17
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt13
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt19
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt13
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt83
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt17
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt30
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini3
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ContentSets.php155
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Context.php82
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Definition.php39
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache.php108
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php62
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php43
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php46
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in47
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php39
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php172
-rwxr-xr-xextlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README3
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php91
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Doctype.php60
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php103
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ElementDef.php176
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Encoder.php426
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/EntityLookup.php44
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser1
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/EntityParser.php144
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ErrorCollector.php209
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/ErrorStruct.php60
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Exception.php12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Filter.php46
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php135
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php39
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Generator.php183
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php420
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule.php244
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php31
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php26
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php38
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php118
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php31
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php40
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php143
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php35
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php47
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php36
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php33
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php27
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php33
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php50
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php54
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php24
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php66
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php71
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php207
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php24
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php9
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php17
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php161
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php14
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php403
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/IDAccumulator.php53
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector.php239
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php340
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php26
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php46
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php45
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php51
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php87
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Language.php163
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Language/messages/en.php62
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/LanguageFactory.php198
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Length.php115
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Lexer.php298
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php213
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php490
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php106
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php3906
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/PercentEncoder.php98
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Printer.php176
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php38
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css10
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js5
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php368
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php272
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/PropertyList.php86
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php32
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy.php26
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php25
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy/Core.php18
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php328
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php457
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php171
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php39
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/StringHash.php39
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/StringHashParser.php110
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/TagTransform.php36
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php96
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php35
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token.php57
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token/Comment.php22
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token/Empty.php11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token/End.php19
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token/Start.php11
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token/Tag.php56
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/Token/Text.php33
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/TokenFactory.php94
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URI.php173
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIDefinition.php93
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIFilter.php45
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php23
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php21
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php114
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php58
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIParser.php70
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme.php42
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php43
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme/http.php20
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme/https.php12
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php27
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme/news.php22
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php20
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php68
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/UnitConverter.php254
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/VarParser.php154
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php96
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/VarParser/Native.php26
-rw-r--r--extlib/HTMLPurifier/HTMLPurifier/VarParserException.php11
-rw-r--r--extlib/HTMLPurifier/LICENSE504
-rw-r--r--js/jquery.form.js1292
-rw-r--r--js/jquery.js1048
-rw-r--r--js/jquery.min.js280
-rw-r--r--js/util.js67
-rw-r--r--lib/action.php2
-rw-r--r--lib/activity.php380
-rw-r--r--lib/adminpanelaction.php29
-rw-r--r--lib/apiaction.php (renamed from lib/api.php)21
-rw-r--r--lib/apiauth.php1
-rw-r--r--lib/atomnoticefeed.php5
-rw-r--r--lib/common.php2
-rw-r--r--lib/default.php1
-rw-r--r--lib/distribqueuehandler.php12
-rw-r--r--lib/joinform.php2
-rw-r--r--lib/leaveform.php2
-rw-r--r--lib/noticelist.php23
-rw-r--r--lib/profilequeuehandler.php52
-rw-r--r--lib/queuemanager.php3
-rw-r--r--lib/router.php7
-rw-r--r--lib/util.php22
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po1779
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po1755
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po1613
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po1600
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po1563
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po1822
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po1558
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po1691
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po2362
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po1551
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po1583
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po1611
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po1580
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po1562
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po1590
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po2668
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po1572
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po1565
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po1749
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po1574
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po1564
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po1901
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po1577
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po1574
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po1623
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po1560
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po1786
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po1581
-rw-r--r--locale/statusnet.po1491
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po2092
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po1738
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po1564
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po1546
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po1574
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po1578
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po1550
-rw-r--r--plugins/Blacklist/BlacklistPlugin.php238
-rw-r--r--plugins/Blacklist/blacklistadminpanel.php222
-rw-r--r--plugins/BlogspamNetPlugin.php8
-rw-r--r--plugins/Mapstraction/map.php2
-rw-r--r--plugins/OStatus/OStatusPlugin.php112
-rw-r--r--plugins/OStatus/README46
-rw-r--r--plugins/OStatus/actions/hostmeta.php16
-rw-r--r--plugins/OStatus/actions/ostatusinit.php6
-rw-r--r--plugins/OStatus/actions/ostatussub.php14
-rw-r--r--plugins/OStatus/actions/pushcallback.php2
-rw-r--r--plugins/OStatus/actions/xrd.php (renamed from plugins/OStatus/actions/webfinger.php)34
-rw-r--r--plugins/OStatus/classes/HubSub.php2
-rw-r--r--plugins/OStatus/classes/Magicsig.php6
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php693
-rw-r--r--plugins/OStatus/extlib/hkit/hcard.profile.php105
-rw-r--r--plugins/OStatus/extlib/hkit/hkit.class.php475
-rw-r--r--plugins/OStatus/js/ostatus.js34
-rw-r--r--plugins/OStatus/lib/discovery.php310
-rw-r--r--plugins/OStatus/lib/hubconfqueuehandler.php (renamed from plugins/OStatus/lib/hubverifyqueuehandler.php)4
-rw-r--r--plugins/OStatus/lib/magicenvelope.php47
-rw-r--r--plugins/OStatus/lib/ostatusqueuehandler.php22
-rw-r--r--plugins/OStatus/lib/pushinqueuehandler.php (renamed from plugins/OStatus/lib/pushinputqueuehandler.php)10
-rw-r--r--plugins/OStatus/lib/salmon.php45
-rw-r--r--plugins/OStatus/lib/salmonaction.php79
-rw-r--r--plugins/OStatus/lib/salmonqueuehandler.php (renamed from plugins/OStatus/lib/salmonoutqueuehandler.php)8
-rw-r--r--plugins/OStatus/lib/webfinger.php151
-rw-r--r--plugins/Realtime/RealtimePlugin.php2
-rw-r--r--plugins/Realtime/icon_external.gifbin90 -> 0 bytes
-rw-r--r--plugins/Realtime/icon_pause.gifbin75 -> 0 bytes
-rw-r--r--plugins/Realtime/icon_play.gifbin75 -> 0 bytes
-rw-r--r--plugins/Realtime/realtimeupdate.css9
-rw-r--r--plugins/Sample/hello.php8
-rw-r--r--plugins/Sample/locale/Sample.po56
-rw-r--r--scripts/createsim.php3
-rwxr-xr-xscripts/init_conversation.php49
-rwxr-xr-xscripts/update_po_templates.php8
-rw-r--r--scripts/updateavatarurl.php4
-rw-r--r--scripts/updateavatarurl_group.php99
-rw-r--r--tests/ActivityParseTests.php (renamed from plugins/OStatus/tests/ActivityParseTests.php)167
-rw-r--r--theme/base/css/display.css1
-rw-r--r--theme/base/images/icons/README54
-rw-r--r--theme/base/images/icons/icon_geo.pngbin894 -> 0 bytes
-rw-r--r--theme/base/images/icons/icons-01.gifbin3870 -> 3740 bytes
-rw-r--r--theme/cloudy/css/display.css37
-rw-r--r--theme/default/css/display.css15
-rw-r--r--theme/identica/css/display.css17
-rw-r--r--theme/otalk/css/base.css1211
-rw-r--r--theme/otalk/css/display.css292
-rw-r--r--theme/otalk/css/ie.css9
-rw-r--r--theme/otalk/default-avatar-mini.pngbin646 -> 0 bytes
-rw-r--r--theme/otalk/default-avatar-profile.pngbin2853 -> 0 bytes
-rw-r--r--theme/otalk/default-avatar-stream.pngbin1487 -> 0 bytes
-rw-r--r--theme/otalk/images/illustrations/illu_arrow-left-01.gifbin75 -> 0 bytes
-rw-r--r--theme/otalk/images/illustrations/illu_pattern-01.pngbin3218 -> 0 bytes
-rw-r--r--theme/otalk/logo.pngbin2228 -> 0 bytes
-rw-r--r--theme/pigeonthoughts/css/base.css122
-rw-r--r--theme/pigeonthoughts/css/display.css247
-rw-r--r--theme/pigeonthoughts/logo.pngbin6389 -> 10107 bytes
466 files changed, 45077 insertions, 48826 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index c387274c0..a2b405acc 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -769,3 +769,20 @@ StartShowSubscriptionsContent: before showing the subscriptions content
EndShowSubscriptionsContent: after showing the subscriptions content
- $action: the current action
+
+StartDeleteUserForm: starting the data in the form for deleting a user
+- $action: action being shown
+- $user: user being deleted
+
+EndDeleteUserForm: Ending the data in the form for deleting a user
+- $action: action being shown
+- $user: user being deleted
+
+StartDeleteUser: handling the post for deleting a user
+- $action: action being shown
+- $user: user being deleted
+
+EndDeleteUser: handling the post for deleting a user
+- $action: action being shown
+- $user: user being deleted
+
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 028d76a78..145806356 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -123,7 +123,9 @@ class ApiGroupCreateAction extends ApiAuthAction
'description' => $this->description,
'location' => $this->location,
'aliases' => $this->aliases,
- 'userid' => $this->user->id));
+ 'userid' => $this->user->id,
+ 'local' => true));
+
switch($this->format) {
case 'xml':
$this->showSingleXmlGroup($group);
@@ -306,9 +308,9 @@ class ApiGroupCreateAction extends ApiAuthAction
function groupNicknameExists($nickname)
{
- $group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
- if (!empty($group)) {
+ if (!empty($local)) {
return true;
}
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index d2ef2978a..e1b54a832 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -134,13 +134,13 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
function getGroups()
{
- $groups = array();
-
- // XXX: Use the $page, $count, $max_id, $since_id, and $since parameters
+ $qry = 'SELECT user_group.* '.
+ 'from user_group join local_group on user_group.id = local_group.group_id '.
+ 'order by created desc ';
$group = new User_group();
- $group->orderBy('created DESC');
- $group->find();
+
+ $group->query($qry);
while ($group->fetch()) {
$groups[] = clone($group);
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index dc1ab8685..296376d19 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -32,8 +32,6 @@ if (!defined('STATUSNET')) {
exit(1);
}
-require_once INSTALLDIR . '/lib/api.php';
-
/**
* Gives a full dump of configuration variables for this instance
* of StatusNet, minus variables that may be security-sensitive (like
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 0bb4860ea..04456ffea 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -107,8 +107,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
$sitename = common_config('site', 'name');
$avatar = $this->group->homepage_logo;
$title = sprintf(_("%s timeline"), $this->group->nickname);
- $taguribase = TagURI::base();
- $id = "tag:$taguribase:GroupTimeline:" . $this->group->id;
$subtitle = sprintf(
_('Updates from %1$s on %2$s!'),
@@ -138,19 +136,9 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
try {
- // If this was called using an integer ID, i.e.: using the canonical
- // URL for this group's feed, then pass the Group object into the feed,
- // so the OStatus plugin, and possibly other plugins, can access it.
- // Feels sorta hacky. -- Z
+ $atom = new AtomGroupNoticeFeed($this->group);
- $atom = null;
- $id = $this->arg('id');
-
- if (strval(intval($id)) === strval($id)) {
- $atom = new AtomGroupNoticeFeed($this->group);
- } else {
- $atom = new AtomGroupNoticeFeed();
- }
+ // @todo set all this Atom junk up inside the feed class
$atom->setId($id);
$atom->setTitle($title);
@@ -169,6 +157,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
$aargs['id'] = $id;
}
+ $atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs));
+
$atom->addLink(
$this->getSelfUri('ApiTimelineGroup', $aargs),
array('rel' => 'self', 'type' => 'application/atom+xml')
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 3e849cc78..b3ded97c0 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -116,8 +116,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$sitename = common_config('site', 'name');
$title = sprintf(_("%s timeline"), $this->user->nickname);
- $taguribase = TagURI::base();
- $id = "tag:$taguribase:UserTimeline:" . $this->user->id;
$link = common_local_url(
'showstream',
array('nickname' => $this->user->nickname)
@@ -148,21 +146,10 @@ class ApiTimelineUserAction extends ApiBareAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- // If this was called using an integer ID, i.e.: using the canonical
- // URL for this user's feed, then pass the User object into the feed,
- // so the OStatus plugin, and possibly other plugins, can access it.
- // Feels sorta hacky. -- Z
+ // @todo set all this Atom junk up inside the feed class
- $atom = null;
- $id = $this->arg('id');
-
- if (strval(intval($id)) === strval($id)) {
- $atom = new AtomUserNoticeFeed($this->user);
- } else {
- $atom = new AtomUserNoticeFeed();
- }
+ $atom = new AtomUserNoticeFeed($this->user);
- $atom->setId($id);
$atom->setTitle($title);
$atom->setSubtitle($subtitle);
$atom->setLogo($logo);
@@ -181,6 +168,8 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$aargs['id'] = $id;
}
+ $atom->setId($this->getSelfUri('ApiTimelineUser', $aargs));
+
$atom->addLink(
$this->getSelfUri('ApiTimelineUser', $aargs),
array('rel' => 'self', 'type' => 'application/atom+xml')
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 0b4caf5bf..a0598db27 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -74,7 +74,14 @@ class BlockedfromgroupAction extends GroupDesignAction
return false;
}
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+
+ if (!$local) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
+
+ $this->group = User_group::staticGet('id', $local->group_id);
if (!$this->group) {
$this->clientError(_('No such group.'), 404);
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index 32b703aa7..c4f84fad2 100644
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -131,18 +131,21 @@ class DeleteuserAction extends ProfileFormAction
$this->elementStart('fieldset');
$this->hidden('token', common_session_token());
$this->element('legend', _('Delete user'));
- $this->element('p', null,
- _('Are you sure you want to delete this user? '.
- 'This will clear all data about the user from the '.
- 'database, without a backup.'));
- $this->element('input', array('id' => 'deleteuserto-' . $id,
- 'name' => 'profileid',
- 'type' => 'hidden',
- 'value' => $id));
- foreach ($this->args as $k => $v) {
- if (substr($k, 0, 9) == 'returnto-') {
- $this->hidden($k, $v);
+ if (Event::handle('StartDeleteUserForm', array($this, $this->user))) {
+ $this->element('p', null,
+ _('Are you sure you want to delete this user? '.
+ 'This will clear all data about the user from the '.
+ 'database, without a backup.'));
+ $this->element('input', array('id' => 'deleteuserto-' . $id,
+ 'name' => 'profileid',
+ 'type' => 'hidden',
+ 'value' => $id));
+ foreach ($this->args as $k => $v) {
+ if (substr($k, 0, 9) == 'returnto-') {
+ $this->hidden($k, $v);
+ }
}
+ Event::handle('EndDeleteUserForm', array($this, $this->user));
}
$this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
$this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user'));
@@ -158,7 +161,9 @@ class DeleteuserAction extends ProfileFormAction
function handlePost()
{
- $this->user->delete();
+ if (Event::handle('StartDeleteUser', array($this, $this->user))) {
+ $this->user->delete();
+ Event::handle('EndDeleteUser', array($this, $this->user));
+ }
}
}
-
diff --git a/actions/editgroup.php b/actions/editgroup.php
index ad0b6e185..4b596cade 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -86,10 +86,14 @@ class EditgroupAction extends GroupDesignAction
}
$groupid = $this->trimmed('groupid');
+
if ($groupid) {
$this->group = User_group::staticGet('id', $groupid);
} else {
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+ if ($local) {
+ $this->group = User_group::staticGet('id', $local->group_id);
+ }
}
if (!$this->group) {
@@ -245,6 +249,7 @@ class EditgroupAction extends GroupDesignAction
$this->group->homepage = $homepage;
$this->group->description = $description;
$this->group->location = $location;
+ $this->group->mainpage = common_local_url('showgroup', array('nickname' => $nickname));
$result = $this->group->update($orig);
@@ -259,6 +264,12 @@ class EditgroupAction extends GroupDesignAction
$this->serverError(_('Could not create aliases.'));
}
+ if ($nickname != $orig->nickname) {
+ common_log(LOG_INFO, "Saving local group info.");
+ $local = Local_group::staticGet('group_id', $this->group->id);
+ $local->setNickname($nickname);
+ }
+
$this->group->query('COMMIT');
if ($this->group->nickname != $orig->nickname) {
@@ -272,10 +283,10 @@ class EditgroupAction extends GroupDesignAction
function nicknameExists($nickname)
{
- $group = User_group::staticGet('nickname', $nickname);
+ $group = Local_group::staticGet('nickname', $nickname);
if (!empty($group) &&
- $group->id != $this->group->id) {
+ $group->group_id != $this->group->id) {
return true;
}
diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index f5fd7fe88..ebdf1cee2 100644
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -56,7 +56,14 @@ class FoafGroupAction extends Action
return false;
}
- $this->group = User_group::staticGet('nickname', $this->nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+
+ if (!$local) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
+
+ $this->group = User_group::staticGet('id', $local->group_id);
if (!$this->group) {
$this->clientError(_('No such group.'), 404);
@@ -113,7 +120,7 @@ class FoafGroupAction extends Action
if ($this->group->homepage_logo) {
$this->element('depiction', array('rdf:resource' => $this->group->homepage_logo));
}
-
+
$members = $this->group->getMembers();
$member_details = array();
while ($members->fetch()) {
@@ -123,7 +130,7 @@ class FoafGroupAction extends Action
);
$this->element('member', array('rdf:resource' => $member_uri));
}
-
+
$admins = $this->group->getAdmins();
while ($admins->fetch()) {
$admin_uri = common_local_url('userbyid', array('id'=>$admins->id));
@@ -132,7 +139,7 @@ class FoafGroupAction extends Action
}
$this->elementEnd('Group');
-
+
ksort($member_details);
foreach ($member_details as $uri => $details) {
if ($details['is_admin'])
@@ -158,7 +165,7 @@ class FoafGroupAction extends Action
));
}
}
-
+
$this->elementEnd('rdf:RDF');
$this->endXML();
}
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index e290ba514..526226a28 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -90,7 +90,10 @@ class GroupDesignSettingsAction extends DesignSettingsAction
if ($groupid) {
$this->group = User_group::staticGet('id', $groupid);
} else {
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+ if ($local) {
+ $this->group = User_group::staticGet('id', $local->group_id);
+ }
}
if (!$this->group) {
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 3c9b56296..f414a23cc 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -92,7 +92,10 @@ class GrouplogoAction extends GroupDesignAction
if ($groupid) {
$this->group = User_group::staticGet('id', $groupid);
} else {
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+ if ($local) {
+ $this->group = User_group::staticGet('id', $local->group_id);
+ }
}
if (!$this->group) {
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index f16e972a4..a16debd7b 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -77,7 +77,14 @@ class GroupmembersAction extends GroupDesignAction
return false;
}
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+
+ if (!$local) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
+
+ $this->group = User_group::staticGet('id', $local->group_id);
if (!$this->group) {
$this->clientError(_('No such group.'), 404);
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 866fc66eb..490f6f945 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -92,7 +92,14 @@ class groupRssAction extends Rss10Action
return false;
}
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+
+ if (!$local) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
+
+ $this->group = User_group::staticGet('id', $local->group_id);
if (!$this->group) {
$this->clientError(_('No such group.'), 404);
diff --git a/actions/groups.php b/actions/groups.php
index 10a1d5964..8aacff8b0 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -109,17 +109,21 @@ class GroupsAction extends Action
}
$offset = ($this->page-1) * GROUPS_PER_PAGE;
- $limit = GROUPS_PER_PAGE + 1;
+ $limit = GROUPS_PER_PAGE + 1;
+
+ $qry = 'SELECT user_group.* '.
+ 'from user_group join local_group on user_group.id = local_group.group_id '.
+ 'order by user_group.created desc '.
+ 'limit ' . $limit . ' offset ' . $offset;
$groups = new User_group();
- $groups->orderBy('created DESC');
- $groups->limit($offset, $limit);
$cnt = 0;
- if ($groups->find()) {
- $gl = new GroupList($groups, null, $this);
- $cnt = $gl->show();
- }
+
+ $groups->query($qry);
+
+ $gl = new GroupList($groups, null, $this);
+ $cnt = $gl->show();
$this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE,
$this->page, 'groups');
diff --git a/actions/hcard.php b/actions/hcard.php
new file mode 100644
index 000000000..55d0f65c8
--- /dev/null
+++ b/actions/hcard.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show the user's hcard
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Personal
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * User profile page
+ *
+ * @category Personal
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+class HcardAction extends Action
+{
+ var $user;
+ var $profile;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ $nickname_arg = $this->arg('nickname');
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ // Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ common_redirect(common_local_url('hcard', $args), 301);
+ return false;
+ }
+
+ $this->user = User::staticGet('nickname', $nickname);
+
+ if (!$this->user) {
+ $this->clientError(_('No such user.'), 404);
+ return false;
+ }
+
+ $this->profile = $this->user->getProfile();
+
+ if (!$this->profile) {
+ $this->serverError(_('User has no profile.'));
+ return false;
+ }
+
+ return true;
+ }
+
+ function handle($args)
+ {
+ parent::handle($args);
+ $this->showPage();
+ }
+
+ function title()
+ {
+ return $this->profile->getBestName();
+ }
+
+ function showContent()
+ {
+ $up = new ShortUserProfile($this, $this->user, $this->profile);
+ $up->show();
+ }
+
+ function showHeader()
+ {
+ return;
+ }
+
+ function showAside()
+ {
+ return;
+ }
+
+ function showSecondaryNav()
+ {
+ return;
+ }
+}
+
+class ShortUserProfile extends UserProfile
+{
+ function showEntityActions()
+ {
+ return;
+ }
+} \ No newline at end of file
diff --git a/actions/joingroup.php b/actions/joingroup.php
index 235e5ab4c..f87e5dae2 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -62,23 +62,33 @@ class JoingroupAction extends Action
}
$nickname_arg = $this->trimmed('nickname');
- $nickname = common_canonical_nickname($nickname_arg);
+ $id = intval($this->arg('id'));
+ if ($id) {
+ $this->group = User_group::staticGet('id', $id);
+ } else if ($nickname_arg) {
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ // Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ common_redirect(common_local_url('leavegroup', $args), 301);
+ return false;
+ }
- // Permanent redirect on non-canonical nickname
+ $local = Local_group::staticGet('nickname', $nickname);
- if ($nickname_arg != $nickname) {
- $args = array('nickname' => $nickname);
- common_redirect(common_local_url('joingroup', $args), 301);
- return false;
- }
+ if (!$local) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
- if (!$nickname) {
- $this->clientError(_('No nickname.'), 404);
+ $this->group = User_group::staticGet('id', $local->group_id);
+ } else {
+ $this->clientError(_('No nickname or ID.'), 404);
return false;
}
- $this->group = User_group::staticGet('nickname', $nickname);
-
if (!$this->group) {
$this->clientError(_('No such group.'), 404);
return false;
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 9b9d83b6c..329b5aafe 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -62,23 +62,33 @@ class LeavegroupAction extends Action
}
$nickname_arg = $this->trimmed('nickname');
- $nickname = common_canonical_nickname($nickname_arg);
+ $id = intval($this->arg('id'));
+ if ($id) {
+ $this->group = User_group::staticGet('id', $id);
+ } else if ($nickname_arg) {
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ // Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ common_redirect(common_local_url('leavegroup', $args), 301);
+ return false;
+ }
- // Permanent redirect on non-canonical nickname
+ $local = Local_group::staticGet('nickname', $nickname);
- if ($nickname_arg != $nickname) {
- $args = array('nickname' => $nickname);
- common_redirect(common_local_url('leavegroup', $args), 301);
- return false;
- }
+ if (!$local) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
- if (!$nickname) {
- $this->clientError(_('No nickname.'), 404);
+ $this->group = User_group::staticGet('id', $local->group_id);
+ } else {
+ $this->clientError(_('No nickname or ID.'), 404);
return false;
}
- $this->group = User_group::staticGet('nickname', $nickname);
-
if (!$this->group) {
$this->clientError(_('No such group.'), 404);
return false;
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 25da7f8fc..75bc293ec 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -180,6 +180,8 @@ class NewgroupAction extends Action
}
}
+ $mainpage = common_local_url('showgroup', array('nickname' => $nickname));
+
$cur = common_current_user();
// Checked in prepare() above
@@ -192,16 +194,18 @@ class NewgroupAction extends Action
'description' => $description,
'location' => $location,
'aliases' => $aliases,
- 'userid' => $cur->id));
+ 'userid' => $cur->id,
+ 'mainpage' => $mainpage,
+ 'local' => true));
common_redirect($group->homeUrl(), 303);
}
function nicknameExists($nickname)
{
- $group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
- if (!empty($group)) {
+ if (!empty($local)) {
return true;
}
diff --git a/actions/showgroup.php b/actions/showgroup.php
index eb1238902..4e1fcb6c7 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -122,9 +122,9 @@ class ShowgroupAction extends GroupDesignAction
return false;
}
- $this->group = User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
- if (!$this->group) {
+ if (!$local) {
$alias = Group_alias::staticGet('alias', $nickname);
if ($alias) {
$args = array('id' => $alias->group_id);
@@ -134,11 +134,19 @@ class ShowgroupAction extends GroupDesignAction
common_redirect(common_local_url('groupbyid', $args), 301);
return false;
} else {
+ common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
$this->clientError(_('No such group.'), 404);
return false;
}
}
+ $this->group = User_group::staticGet('id', $local->group_id);
+
+ if (!$this->group) {
+ $this->clientError(_('No such group.'), 404);
+ return false;
+ }
+
common_set_returnto($this->selfUrl());
return true;
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 3745311b6..b1243f393 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -145,7 +145,7 @@ class SubscribeAction extends Action
$this->element('title', null, _('Subscribed'));
$this->elementEnd('head');
$this->elementStart('body');
- $unsubscribe = new UnsubscribeForm($this, $this->other->getProfile());
+ $unsubscribe = new UnsubscribeForm($this, $this->other);
$unsubscribe->show();
$this->elementEnd('body');
$this->elementEnd('html');
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index e389ddec8..24aa619bd 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/api.php';
-
/**
* Action for outputting search results in Twitter compatible Atom
* format.
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 741ed78d6..b5c006aa7 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/api.php';
require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
/**
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 779405e6d..5a04569a2 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/api.php';
-
/**
* Returns the top ten queries that are currently trending
*
diff --git a/classes/Local_group.php b/classes/Local_group.php
new file mode 100644
index 000000000..42312ec63
--- /dev/null
+++ b/classes/Local_group.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Table Definition for local_group
+ */
+
+class Local_group extends Memcached_DataObject
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__table = 'local_group'; // table name
+ public $group_id; // int(4) primary_key not_null
+ public $nickname; // varchar(64) unique_key
+ public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00
+ public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
+
+ /* Static get */
+ function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Local_group',$k,$v); }
+
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+
+ function sequenceKey()
+ {
+ return array(false, false, false);
+ }
+
+ function setNickname($nickname)
+ {
+ $this->decache();
+ $qry = 'UPDATE local_group set nickname = "'.$nickname.'" where group_id = ' . $this->group_id;
+
+ $result = $this->query($qry);
+
+ if ($result) {
+ $this->nickname = $nickname;
+ $this->fixupTimestamps();
+ $this->encache();
+ } else {
+ common_log_db_error($local, 'UPDATE', __FILE__);
+ throw new ServerException(_('Could not update local group.'));
+ }
+
+ return $result;
+ }
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index e8d5c45cb..ac4640534 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -121,6 +121,9 @@ class Notice extends Memcached_DataObject
$result = parent::delete();
}
+ /**
+ * Extract #hashtags from this notice's content and save them to the database.
+ */
function saveTags()
{
/* extract all #hastags */
@@ -129,14 +132,22 @@ class Notice extends Memcached_DataObject
return true;
}
+ /* Add them to the database */
+ return $this->saveKnownTags($match[1]);
+ }
+
+ /**
+ * Record the given set of hash tags in the db for this notice.
+ * Given tag strings will be normalized and checked for dupes.
+ */
+ function saveKnownTags($hashtags)
+ {
//turn each into their canonical tag
//this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
- $hashtags = array();
- for($i=0; $i<count($match[1]); $i++) {
- $hashtags[] = common_canonical_tag($match[1][$i]);
+ for($i=0; $i<count($hashtags); $i++) {
+ $hashtags[$i] = common_canonical_tag($hashtags[$i]);
}
- /* Add them to the database */
foreach(array_unique($hashtags) as $hashtag) {
/* elide characters we don't want in the tag */
$this->saveTag($hashtag);
@@ -145,6 +156,10 @@ class Notice extends Memcached_DataObject
return true;
}
+ /**
+ * Record a single hash tag as associated with this notice.
+ * Tag format and uniqueness must be validated by caller.
+ */
function saveTag($hashtag)
{
$tag = new Notice_tag();
@@ -194,6 +209,8 @@ class Notice extends Memcached_DataObject
* place of extracting @-replies from content.
* array 'groups' list of group IDs to deliver to, in place of
* extracting ! tags from content
+ * array 'tags' list of hashtag strings to save with the notice
+ * in place of extracting # tags from content
* @fixme tag override
*
* @return Notice
@@ -343,6 +360,8 @@ class Notice extends Memcached_DataObject
$notice->blowOnInsert();
+ // Save per-notice metadata...
+
if (isset($replies)) {
$notice->saveKnownReplies($replies);
} else {
@@ -355,6 +374,16 @@ class Notice extends Memcached_DataObject
$notice->saveGroups();
}
+ if (isset($tags)) {
+ $notice->saveKnownTags($tags);
+ } else {
+ $notice->saveTags();
+ }
+
+ // @fixme pass in data for URLs too?
+ $notice->saveUrls();
+
+ // Prepare inbox delivery, may be queued to background.
$notice->distribute();
return $notice;
@@ -1067,6 +1096,7 @@ class Notice extends Memcached_DataObject
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
'xmlns:georss' => 'http://www.georss.org/georss',
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
+ 'xmlns:media' => 'http://purl.org/syndication/atommedia',
'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
'xmlns:ostatus' => 'http://ostatus.org/schema/1.0');
} else {
diff --git a/classes/User_group.php b/classes/User_group.php
index 1382aa407..7240e2703 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -10,21 +10,23 @@ class User_group extends Memcached_DataObject
public $__table = 'user_group'; // table name
public $id; // int(4) primary_key not_null
- public $nickname; // varchar(64) unique_key
+ public $nickname; // varchar(64)
public $fullname; // varchar(255)
public $homepage; // varchar(255)
- public $description; // text()
+ public $description; // text
public $location; // varchar(255)
public $original_logo; // varchar(255)
public $homepage_logo; // varchar(255)
public $stream_logo; // varchar(255)
public $mini_logo; // varchar(255)
public $design_id; // int(4)
- public $created; // datetime() not_null
- public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
+ public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00
+ public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
+ public $uri; // varchar(255) unique_key
+ public $mainpage; // varchar(255)
/* Static get */
- function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_group',$k,$v); }
+ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('User_group',$k,$v); }
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
@@ -41,13 +43,33 @@ class User_group extends Memcached_DataObject
{
$url = null;
if (Event::handle('StartUserGroupHomeUrl', array($this, &$url))) {
- $url = common_local_url('showgroup',
- array('nickname' => $this->nickname));
+ // normally stored in mainpage, but older ones may be null
+ if (!empty($this->mainpage)) {
+ $url = $this->mainpage;
+ } else {
+ $url = common_local_url('showgroup',
+ array('nickname' => $this->nickname));
+ }
}
Event::handle('EndUserGroupHomeUrl', array($this, &$url));
return $url;
}
+ function getUri()
+ {
+ $uri = null;
+ if (Event::handle('StartUserGroupGetUri', array($this, &$uri))) {
+ if (!empty($this->uri)) {
+ $uri = $this->uri;
+ } else {
+ $uri = common_local_url('groupbyid',
+ array('id' => $this->id));
+ }
+ }
+ Event::handle('EndUserGroupGetUri', array($this, &$uri));
+ return $uri;
+ }
+
function permalink()
{
$url = null;
@@ -377,25 +399,41 @@ class User_group extends Memcached_DataObject
return $xs->getString();
}
+ /**
+ * Returns an XML string fragment with group information as an
+ * Activity Streams <activity:subject> element.
+ *
+ * Assumes that 'activity' namespace has been previously defined.
+ *
+ * @return string
+ */
function asActivitySubject()
{
- $xs = new XMLStringer(true);
+ return $this->asActivityNoun('subject');
+ }
- $xs->elementStart('activity:subject');
- $xs->element('activity:object', null, 'http://activitystrea.ms/schema/1.0/group');
- $xs->element('id', null, $this->permalink());
- $xs->element('title', null, $this->getBestName());
- $xs->element(
- 'link', array(
- 'rel' => 'avatar',
- 'href' => empty($this->homepage_logo)
- ? User_group::defaultLogo(AVATAR_PROFILE_SIZE)
- : $this->homepage_logo
- )
- );
- $xs->elementEnd('activity:subject');
+ /**
+ * Returns an XML string fragment with group information as an
+ * Activity Streams noun object with the given element type.
+ *
+ * Assumes that 'activity', 'georss', and 'poco' namespace has been
+ * previously defined.
+ *
+ * @param string $element one of 'actor', 'subject', 'object', 'target'
+ *
+ * @return string
+ */
+ function asActivityNoun($element)
+ {
+ $noun = ActivityObject::fromGroup($this);
+ return $noun->asString('activity:' . $element);
+ }
- return $xs->getString();
+ function getAvatar()
+ {
+ return empty($this->homepage_logo)
+ ? User_group::defaultLogo(AVATAR_PROFILE_SIZE)
+ : $this->homepage_logo;
}
static function register($fields) {
@@ -413,28 +451,31 @@ class User_group extends Memcached_DataObject
$group->homepage = $homepage;
$group->description = $description;
$group->location = $location;
+ $group->uri = $uri;
+ $group->mainpage = $mainpage;
$group->created = common_sql_now();
$result = $group->insert();
if (!$result) {
common_log_db_error($group, 'INSERT', __FILE__);
- $this->serverError(
- _('Could not create group.'),
- 500,
- $this->format
- );
- return;
+ throw new ServerException(_('Could not create group.'));
}
+
+ if (!isset($uri) || empty($uri)) {
+ $orig = clone($group);
+ $group->uri = common_local_url('groupbyid', array('id' => $group->id));
+ $result = $group->update($orig);
+ if (!$result) {
+ common_log_db_error($group, 'UPDATE', __FILE__);
+ throw new ServerException(_('Could not set group uri.'));
+ }
+ }
+
$result = $group->setAliases($aliases);
if (!$result) {
- $this->serverError(
- _('Could not create aliases.'),
- 500,
- $this->format
- );
- return;
+ throw new ServerException(_('Could not create aliases.'));
}
$member = new Group_member();
@@ -448,12 +489,22 @@ class User_group extends Memcached_DataObject
if (!$result) {
common_log_db_error($member, 'INSERT', __FILE__);
- $this->serverError(
- _('Could not set group membership.'),
- 500,
- $this->format
- );
- return;
+ throw new ServerException(_('Could not set group membership.'));
+ }
+
+ if ($local) {
+ $local_group = new Local_group();
+
+ $local_group->group_id = $group->id;
+ $local_group->nickname = $nickname;
+ $local_group->created = common_sql_now();
+
+ $result = $local_group->insert();
+
+ if (!$result) {
+ common_log_db_error($local_group, 'INSERT', __FILE__);
+ throw new ServerException(_('Could not save local group info.'));
+ }
}
$group->query('COMMIT');
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 81c1b68b2..3fb8ee208 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -245,13 +245,6 @@ modified = 384
group_id = K
profile_id = K
-[invitation]
-code = 130
-user_id = 129
-address = 130
-address_type = 130
-created = 142
-
[inbox]
user_id = 129
notice_ids = 66
@@ -259,9 +252,26 @@ notice_ids = 66
[inbox__keys]
user_id = K
+[invitation]
+code = 130
+user_id = 129
+address = 130
+address_type = 130
+created = 142
+
[invitation__keys]
code = K
+[local_group]
+group_id = 129
+nickname = 2
+created = 142
+modified = 384
+
+[local_group__keys]
+group_id = K
+nickname = U
+
[location_namespace]
id = 129
description = 2
@@ -369,7 +379,7 @@ icon = 130
source_url = 2
organization = 2
homepage = 2
-callback_url = 130
+callback_url = 2
type = 17
access_type = 17
created = 142
@@ -440,13 +450,13 @@ tag = K
[queue_item]
id = 129
-frame = 66
+frame = 194
transport = 130
created = 142
claimed = 14
[queue_item__keys]
-id = K
+id = N
[related_group]
group_id = 129
@@ -593,10 +603,11 @@ mini_logo = 2
design_id = 1
created = 142
modified = 384
+uri = 2
+mainpage = 2
[user_group__keys]
id = N
-nickname = U
[user_openid]
canonical = 130
@@ -627,4 +638,3 @@ modified = 384
[user_location_prefs__keys]
user_id = K
-
diff --git a/db/beta5tobeta6.sql b/db/beta5tobeta6.sql
new file mode 100644
index 000000000..e9dff17ef
--- /dev/null
+++ b/db/beta5tobeta6.sql
@@ -0,0 +1,28 @@
+alter table oauth_application
+ modify column name varchar(255) not null unique key comment 'name of the application',
+ modify column access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write';
+
+alter table user_group
+add column uri varchar(255) unique key comment 'universal identifier',
+add column mainpage varchar(255) comment 'page for group info to link to',
+drop index nickname;
+
+create table conversation (
+ id integer auto_increment primary key comment 'unique identifier',
+ uri varchar(225) unique comment 'URI of the conversation',
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified'
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table local_group (
+ group_id integer primary key comment 'group represented' references user_group (id),
+ nickname varchar(64) unique key comment 'group represented',
+
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified'
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+insert into local_group (group_id, nickname, created)
+select id, nickname, created from user_group;
+
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 97117c80a..4158f0167 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -406,7 +406,7 @@ create table profile_block (
create table user_group (
id integer auto_increment primary key comment 'unique identifier',
- nickname varchar(64) unique key comment 'nickname for addressing',
+ nickname varchar(64) comment 'nickname for addressing',
fullname varchar(255) comment 'display name',
homepage varchar(255) comment 'URL, cached so we dont regenerate',
description text comment 'group description',
@@ -421,6 +421,9 @@ create table user_group (
created datetime not null comment 'date this record was created',
modified timestamp comment 'date this record was modified',
+ uri varchar(255) unique key comment 'universal identifier',
+ mainpage varchar(255) comment 'page for group info to link to',
+
index user_group_nickname_idx (nickname)
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
@@ -641,3 +644,13 @@ create table conversation (
modified timestamp comment 'date this record was modified'
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+create table local_group (
+
+ group_id integer primary key comment 'group represented' references user_group (id),
+ nickname varchar(64) unique key comment 'group represented',
+
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified'
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
diff --git a/extlib/HTMLPurifier/HTMLPurifier.auto.php b/extlib/HTMLPurifier/HTMLPurifier.auto.php
deleted file mode 100644
index 1960c399f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.auto.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * This is a stub include that automatically configures the include path.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-require_once 'HTMLPurifier/Bootstrap.php';
-require_once 'HTMLPurifier.autoload.php';
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier.autoload.php b/extlib/HTMLPurifier/HTMLPurifier.autoload.php
deleted file mode 100644
index 8d4017640..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Convenience file that registers autoload handler for HTML Purifier.
- */
-
-if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
- // We need unregister for our pre-registering functionality
- HTMLPurifier_Bootstrap::registerAutoload();
- if (function_exists('__autoload')) {
- // Be polite and ensure that userland autoload gets retained
- spl_autoload_register('__autoload');
- }
-} elseif (!function_exists('__autoload')) {
- function __autoload($class) {
- return HTMLPurifier_Bootstrap::autoload($class);
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier.func.php b/extlib/HTMLPurifier/HTMLPurifier.func.php
deleted file mode 100644
index 56a55b2fe..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.func.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- * Defines a function wrapper for HTML Purifier for quick use.
- * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
- */
-
-/**
- * Purify HTML.
- * @param $html String HTML to purify
- * @param $config Configuration to use, can be any value accepted by
- * HTMLPurifier_Config::create()
- */
-function HTMLPurifier($html, $config = null) {
- static $purifier = false;
- if (!$purifier) {
- $purifier = new HTMLPurifier();
- }
- return $purifier->purify($html, $config);
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier.includes.php b/extlib/HTMLPurifier/HTMLPurifier.includes.php
deleted file mode 100644
index 7cfb97060..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.includes.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. Use this if performance is a
- * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
- * FILE, changes will be overwritten the next time the script is run.
- *
- * @version 4.0.0
- *
- * @warning
- * You must *not* include any other HTML Purifier files before this file,
- * because 'require' not 'require_once' is used.
- *
- * @warning
- * This file requires that the include path contains the HTML Purifier
- * library directory; this is not auto-set.
- */
-
-require 'HTMLPurifier.php';
-require 'HTMLPurifier/AttrCollections.php';
-require 'HTMLPurifier/AttrDef.php';
-require 'HTMLPurifier/AttrTransform.php';
-require 'HTMLPurifier/AttrTypes.php';
-require 'HTMLPurifier/AttrValidator.php';
-require 'HTMLPurifier/Bootstrap.php';
-require 'HTMLPurifier/Definition.php';
-require 'HTMLPurifier/CSSDefinition.php';
-require 'HTMLPurifier/ChildDef.php';
-require 'HTMLPurifier/Config.php';
-require 'HTMLPurifier/ConfigSchema.php';
-require 'HTMLPurifier/ContentSets.php';
-require 'HTMLPurifier/Context.php';
-require 'HTMLPurifier/DefinitionCache.php';
-require 'HTMLPurifier/DefinitionCacheFactory.php';
-require 'HTMLPurifier/Doctype.php';
-require 'HTMLPurifier/DoctypeRegistry.php';
-require 'HTMLPurifier/ElementDef.php';
-require 'HTMLPurifier/Encoder.php';
-require 'HTMLPurifier/EntityLookup.php';
-require 'HTMLPurifier/EntityParser.php';
-require 'HTMLPurifier/ErrorCollector.php';
-require 'HTMLPurifier/ErrorStruct.php';
-require 'HTMLPurifier/Exception.php';
-require 'HTMLPurifier/Filter.php';
-require 'HTMLPurifier/Generator.php';
-require 'HTMLPurifier/HTMLDefinition.php';
-require 'HTMLPurifier/HTMLModule.php';
-require 'HTMLPurifier/HTMLModuleManager.php';
-require 'HTMLPurifier/IDAccumulator.php';
-require 'HTMLPurifier/Injector.php';
-require 'HTMLPurifier/Language.php';
-require 'HTMLPurifier/LanguageFactory.php';
-require 'HTMLPurifier/Length.php';
-require 'HTMLPurifier/Lexer.php';
-require 'HTMLPurifier/PercentEncoder.php';
-require 'HTMLPurifier/PropertyList.php';
-require 'HTMLPurifier/PropertyListIterator.php';
-require 'HTMLPurifier/Strategy.php';
-require 'HTMLPurifier/StringHash.php';
-require 'HTMLPurifier/StringHashParser.php';
-require 'HTMLPurifier/TagTransform.php';
-require 'HTMLPurifier/Token.php';
-require 'HTMLPurifier/TokenFactory.php';
-require 'HTMLPurifier/URI.php';
-require 'HTMLPurifier/URIDefinition.php';
-require 'HTMLPurifier/URIFilter.php';
-require 'HTMLPurifier/URIParser.php';
-require 'HTMLPurifier/URIScheme.php';
-require 'HTMLPurifier/URISchemeRegistry.php';
-require 'HTMLPurifier/UnitConverter.php';
-require 'HTMLPurifier/VarParser.php';
-require 'HTMLPurifier/VarParserException.php';
-require 'HTMLPurifier/AttrDef/CSS.php';
-require 'HTMLPurifier/AttrDef/Enum.php';
-require 'HTMLPurifier/AttrDef/Integer.php';
-require 'HTMLPurifier/AttrDef/Lang.php';
-require 'HTMLPurifier/AttrDef/Switch.php';
-require 'HTMLPurifier/AttrDef/Text.php';
-require 'HTMLPurifier/AttrDef/URI.php';
-require 'HTMLPurifier/AttrDef/CSS/Number.php';
-require 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require 'HTMLPurifier/AttrDef/CSS/Background.php';
-require 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require 'HTMLPurifier/AttrDef/CSS/Border.php';
-require 'HTMLPurifier/AttrDef/CSS/Color.php';
-require 'HTMLPurifier/AttrDef/CSS/Composite.php';
-require 'HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Filter.php';
-require 'HTMLPurifier/AttrDef/CSS/Font.php';
-require 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require 'HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Length.php';
-require 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require 'HTMLPurifier/AttrDef/CSS/Multiple.php';
-require 'HTMLPurifier/AttrDef/CSS/Percentage.php';
-require 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require 'HTMLPurifier/AttrDef/CSS/URI.php';
-require 'HTMLPurifier/AttrDef/HTML/Bool.php';
-require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require 'HTMLPurifier/AttrDef/HTML/Class.php';
-require 'HTMLPurifier/AttrDef/HTML/Color.php';
-require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require 'HTMLPurifier/AttrDef/HTML/ID.php';
-require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
-require 'HTMLPurifier/AttrDef/HTML/Length.php';
-require 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require 'HTMLPurifier/AttrDef/URI/Email.php';
-require 'HTMLPurifier/AttrDef/URI/Host.php';
-require 'HTMLPurifier/AttrDef/URI/IPv4.php';
-require 'HTMLPurifier/AttrDef/URI/IPv6.php';
-require 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require 'HTMLPurifier/AttrTransform/Background.php';
-require 'HTMLPurifier/AttrTransform/BdoDir.php';
-require 'HTMLPurifier/AttrTransform/BgColor.php';
-require 'HTMLPurifier/AttrTransform/BoolToCSS.php';
-require 'HTMLPurifier/AttrTransform/Border.php';
-require 'HTMLPurifier/AttrTransform/EnumToCSS.php';
-require 'HTMLPurifier/AttrTransform/ImgRequired.php';
-require 'HTMLPurifier/AttrTransform/ImgSpace.php';
-require 'HTMLPurifier/AttrTransform/Input.php';
-require 'HTMLPurifier/AttrTransform/Lang.php';
-require 'HTMLPurifier/AttrTransform/Length.php';
-require 'HTMLPurifier/AttrTransform/Name.php';
-require 'HTMLPurifier/AttrTransform/NameSync.php';
-require 'HTMLPurifier/AttrTransform/SafeEmbed.php';
-require 'HTMLPurifier/AttrTransform/SafeObject.php';
-require 'HTMLPurifier/AttrTransform/SafeParam.php';
-require 'HTMLPurifier/AttrTransform/ScriptRequired.php';
-require 'HTMLPurifier/AttrTransform/Textarea.php';
-require 'HTMLPurifier/ChildDef/Chameleon.php';
-require 'HTMLPurifier/ChildDef/Custom.php';
-require 'HTMLPurifier/ChildDef/Empty.php';
-require 'HTMLPurifier/ChildDef/Required.php';
-require 'HTMLPurifier/ChildDef/Optional.php';
-require 'HTMLPurifier/ChildDef/StrictBlockquote.php';
-require 'HTMLPurifier/ChildDef/Table.php';
-require 'HTMLPurifier/DefinitionCache/Decorator.php';
-require 'HTMLPurifier/DefinitionCache/Null.php';
-require 'HTMLPurifier/DefinitionCache/Serializer.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require 'HTMLPurifier/HTMLModule/Bdo.php';
-require 'HTMLPurifier/HTMLModule/CommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Edit.php';
-require 'HTMLPurifier/HTMLModule/Forms.php';
-require 'HTMLPurifier/HTMLModule/Hypertext.php';
-require 'HTMLPurifier/HTMLModule/Image.php';
-require 'HTMLPurifier/HTMLModule/Legacy.php';
-require 'HTMLPurifier/HTMLModule/List.php';
-require 'HTMLPurifier/HTMLModule/Name.php';
-require 'HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Object.php';
-require 'HTMLPurifier/HTMLModule/Presentation.php';
-require 'HTMLPurifier/HTMLModule/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Ruby.php';
-require 'HTMLPurifier/HTMLModule/SafeEmbed.php';
-require 'HTMLPurifier/HTMLModule/SafeObject.php';
-require 'HTMLPurifier/HTMLModule/Scripting.php';
-require 'HTMLPurifier/HTMLModule/StyleAttribute.php';
-require 'HTMLPurifier/HTMLModule/Tables.php';
-require 'HTMLPurifier/HTMLModule/Target.php';
-require 'HTMLPurifier/HTMLModule/Text.php';
-require 'HTMLPurifier/HTMLModule/Tidy.php';
-require 'HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Name.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require 'HTMLPurifier/Injector/AutoParagraph.php';
-require 'HTMLPurifier/Injector/DisplayLinkURI.php';
-require 'HTMLPurifier/Injector/Linkify.php';
-require 'HTMLPurifier/Injector/PurifierLinkify.php';
-require 'HTMLPurifier/Injector/RemoveEmpty.php';
-require 'HTMLPurifier/Injector/SafeObject.php';
-require 'HTMLPurifier/Lexer/DOMLex.php';
-require 'HTMLPurifier/Lexer/DirectLex.php';
-require 'HTMLPurifier/Strategy/Composite.php';
-require 'HTMLPurifier/Strategy/Core.php';
-require 'HTMLPurifier/Strategy/FixNesting.php';
-require 'HTMLPurifier/Strategy/MakeWellFormed.php';
-require 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-require 'HTMLPurifier/Strategy/ValidateAttributes.php';
-require 'HTMLPurifier/TagTransform/Font.php';
-require 'HTMLPurifier/TagTransform/Simple.php';
-require 'HTMLPurifier/Token/Comment.php';
-require 'HTMLPurifier/Token/Tag.php';
-require 'HTMLPurifier/Token/Empty.php';
-require 'HTMLPurifier/Token/End.php';
-require 'HTMLPurifier/Token/Start.php';
-require 'HTMLPurifier/Token/Text.php';
-require 'HTMLPurifier/URIFilter/DisableExternal.php';
-require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
-require 'HTMLPurifier/URIFilter/HostBlacklist.php';
-require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
-require 'HTMLPurifier/URIFilter/Munge.php';
-require 'HTMLPurifier/URIScheme/ftp.php';
-require 'HTMLPurifier/URIScheme/http.php';
-require 'HTMLPurifier/URIScheme/https.php';
-require 'HTMLPurifier/URIScheme/mailto.php';
-require 'HTMLPurifier/URIScheme/news.php';
-require 'HTMLPurifier/URIScheme/nntp.php';
-require 'HTMLPurifier/VarParser/Flexible.php';
-require 'HTMLPurifier/VarParser/Native.php';
diff --git a/extlib/HTMLPurifier/HTMLPurifier.kses.php b/extlib/HTMLPurifier/HTMLPurifier.kses.php
deleted file mode 100644
index 3143feb17..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.kses.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Emulation layer for code that used kses(), substituting in HTML Purifier.
- */
-
-require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';
-
-function kses($string, $allowed_html, $allowed_protocols = null) {
- $config = HTMLPurifier_Config::createDefault();
- $allowed_elements = array();
- $allowed_attributes = array();
- foreach ($allowed_html as $element => $attributes) {
- $allowed_elements[$element] = true;
- foreach ($attributes as $attribute => $x) {
- $allowed_attributes["$element.$attribute"] = true;
- }
- }
- $config->set('HTML.AllowedElements', $allowed_elements);
- $config->set('HTML.AllowedAttributes', $allowed_attributes);
- $allowed_schemes = array();
- if ($allowed_protocols !== null) {
- $config->set('URI.AllowedSchemes', $allowed_protocols);
- }
- $purifier = new HTMLPurifier($config);
- return $purifier->purify($string);
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier.path.php b/extlib/HTMLPurifier/HTMLPurifier.path.php
deleted file mode 100644
index 39b1b6531..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.path.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * @file
- * Convenience stub file that adds HTML Purifier's library file to the path
- * without any other side-effects.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier.php b/extlib/HTMLPurifier/HTMLPurifier.php
deleted file mode 100644
index e3fce9c2a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-/*! @mainpage
- *
- * HTML Purifier is an HTML filter that will take an arbitrary snippet of
- * HTML and rigorously test, validate and filter it into a version that
- * is safe for output onto webpages. It achieves this by:
- *
- * -# Lexing (parsing into tokens) the document,
- * -# Executing various strategies on the tokens:
- * -# Removing all elements not in the whitelist,
- * -# Making the tokens well-formed,
- * -# Fixing the nesting of the nodes, and
- * -# Validating attributes of the nodes; and
- * -# Generating HTML from the purified tokens.
- *
- * However, most users will only need to interface with the HTMLPurifier
- * and HTMLPurifier_Config.
- */
-
-/*
- HTML Purifier 4.0.0 - Standards Compliant HTML Filtering
- Copyright (C) 2006-2008 Edward Z. Yang
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * Facade that coordinates HTML Purifier's subsystems in order to purify HTML.
- *
- * @note There are several points in which configuration can be specified
- * for HTML Purifier. The precedence of these (from lowest to
- * highest) is as follows:
- * -# Instance: new HTMLPurifier($config)
- * -# Invocation: purify($html, $config)
- * These configurations are entirely independent of each other and
- * are *not* merged (this behavior may change in the future).
- *
- * @todo We need an easier way to inject strategies using the configuration
- * object.
- */
-class HTMLPurifier
-{
-
- /** Version of HTML Purifier */
- public $version = '4.0.0';
-
- /** Constant with version of HTML Purifier */
- const VERSION = '4.0.0';
-
- /** Global configuration object */
- public $config;
-
- /** Array of extra HTMLPurifier_Filter objects to run on HTML, for backwards compatibility */
- private $filters = array();
-
- /** Single instance of HTML Purifier */
- private static $instance;
-
- protected $strategy, $generator;
-
- /**
- * Resultant HTMLPurifier_Context of last run purification. Is an array
- * of contexts if the last called method was purifyArray().
- */
- public $context;
-
- /**
- * Initializes the purifier.
- * @param $config Optional HTMLPurifier_Config object for all instances of
- * the purifier, if omitted, a default configuration is
- * supplied (which can be overridden on a per-use basis).
- * The parameter can also be any type that
- * HTMLPurifier_Config::create() supports.
- */
- public function __construct($config = null) {
-
- $this->config = HTMLPurifier_Config::create($config);
-
- $this->strategy = new HTMLPurifier_Strategy_Core();
-
- }
-
- /**
- * Adds a filter to process the output. First come first serve
- * @param $filter HTMLPurifier_Filter object
- */
- public function addFilter($filter) {
- trigger_error('HTMLPurifier->addFilter() is deprecated, use configuration directives in the Filter namespace or Filter.Custom', E_USER_WARNING);
- $this->filters[] = $filter;
- }
-
- /**
- * Filters an HTML snippet/document to be XSS-free and standards-compliant.
- *
- * @param $html String of HTML to purify
- * @param $config HTMLPurifier_Config object for this operation, if omitted,
- * defaults to the config object specified during this
- * object's construction. The parameter can also be any type
- * that HTMLPurifier_Config::create() supports.
- * @return Purified HTML
- */
- public function purify($html, $config = null) {
-
- // :TODO: make the config merge in, instead of replace
- $config = $config ? HTMLPurifier_Config::create($config) : $this->config;
-
- // implementation is partially environment dependant, partially
- // configuration dependant
- $lexer = HTMLPurifier_Lexer::create($config);
-
- $context = new HTMLPurifier_Context();
-
- // setup HTML generator
- $this->generator = new HTMLPurifier_Generator($config, $context);
- $context->register('Generator', $this->generator);
-
- // set up global context variables
- if ($config->get('Core.CollectErrors')) {
- // may get moved out if other facilities use it
- $language_factory = HTMLPurifier_LanguageFactory::instance();
- $language = $language_factory->create($config, $context);
- $context->register('Locale', $language);
-
- $error_collector = new HTMLPurifier_ErrorCollector($context);
- $context->register('ErrorCollector', $error_collector);
- }
-
- // setup id_accumulator context, necessary due to the fact that
- // AttrValidator can be called from many places
- $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
- $context->register('IDAccumulator', $id_accumulator);
-
- $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
-
- // setup filters
- $filter_flags = $config->getBatch('Filter');
- $custom_filters = $filter_flags['Custom'];
- unset($filter_flags['Custom']);
- $filters = array();
- foreach ($filter_flags as $filter => $flag) {
- if (!$flag) continue;
- if (strpos($filter, '.') !== false) continue;
- $class = "HTMLPurifier_Filter_$filter";
- $filters[] = new $class;
- }
- foreach ($custom_filters as $filter) {
- // maybe "HTMLPurifier_Filter_$filter", but be consistent with AutoFormat
- $filters[] = $filter;
- }
- $filters = array_merge($filters, $this->filters);
- // maybe prepare(), but later
-
- for ($i = 0, $filter_size = count($filters); $i < $filter_size; $i++) {
- $html = $filters[$i]->preFilter($html, $config, $context);
- }
-
- // purified HTML
- $html =
- $this->generator->generateFromTokens(
- // list of tokens
- $this->strategy->execute(
- // list of un-purified tokens
- $lexer->tokenizeHTML(
- // un-purified HTML
- $html, $config, $context
- ),
- $config, $context
- )
- );
-
- for ($i = $filter_size - 1; $i >= 0; $i--) {
- $html = $filters[$i]->postFilter($html, $config, $context);
- }
-
- $html = HTMLPurifier_Encoder::convertFromUTF8($html, $config, $context);
- $this->context =& $context;
- return $html;
- }
-
- /**
- * Filters an array of HTML snippets
- * @param $config Optional HTMLPurifier_Config object for this operation.
- * See HTMLPurifier::purify() for more details.
- * @return Array of purified HTML
- */
- public function purifyArray($array_of_html, $config = null) {
- $context_array = array();
- foreach ($array_of_html as $key => $html) {
- $array_of_html[$key] = $this->purify($html, $config);
- $context_array[$key] = $this->context;
- }
- $this->context = $context_array;
- return $array_of_html;
- }
-
- /**
- * Singleton for enforcing just one HTML Purifier in your system
- * @param $prototype Optional prototype HTMLPurifier instance to
- * overload singleton with, or HTMLPurifier_Config
- * instance to configure the generated version with.
- */
- public static function instance($prototype = null) {
- if (!self::$instance || $prototype) {
- if ($prototype instanceof HTMLPurifier) {
- self::$instance = $prototype;
- } elseif ($prototype) {
- self::$instance = new HTMLPurifier($prototype);
- } else {
- self::$instance = new HTMLPurifier();
- }
- }
- return self::$instance;
- }
-
- /**
- * @note Backwards compatibility, see instance()
- */
- public static function getInstance($prototype = null) {
- return HTMLPurifier::instance($prototype);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier.safe-includes.php b/extlib/HTMLPurifier/HTMLPurifier.safe-includes.php
deleted file mode 100644
index cf2c1d617..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier.safe-includes.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. This is a convenience stub that
- * includes all files using dirname(__FILE__) and require_once. PLEASE DO NOT
- * EDIT THIS FILE, changes will be overwritten the next time the script is run.
- *
- * Changes to include_path are not necessary.
- */
-
-$__dir = dirname(__FILE__);
-
-require_once $__dir . '/HTMLPurifier.php';
-require_once $__dir . '/HTMLPurifier/AttrCollections.php';
-require_once $__dir . '/HTMLPurifier/AttrDef.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform.php';
-require_once $__dir . '/HTMLPurifier/AttrTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrValidator.php';
-require_once $__dir . '/HTMLPurifier/Bootstrap.php';
-require_once $__dir . '/HTMLPurifier/Definition.php';
-require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
-require_once $__dir . '/HTMLPurifier/ChildDef.php';
-require_once $__dir . '/HTMLPurifier/Config.php';
-require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
-require_once $__dir . '/HTMLPurifier/ContentSets.php';
-require_once $__dir . '/HTMLPurifier/Context.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
-require_once $__dir . '/HTMLPurifier/Doctype.php';
-require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
-require_once $__dir . '/HTMLPurifier/ElementDef.php';
-require_once $__dir . '/HTMLPurifier/Encoder.php';
-require_once $__dir . '/HTMLPurifier/EntityLookup.php';
-require_once $__dir . '/HTMLPurifier/EntityParser.php';
-require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
-require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
-require_once $__dir . '/HTMLPurifier/Exception.php';
-require_once $__dir . '/HTMLPurifier/Filter.php';
-require_once $__dir . '/HTMLPurifier/Generator.php';
-require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule.php';
-require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
-require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
-require_once $__dir . '/HTMLPurifier/Injector.php';
-require_once $__dir . '/HTMLPurifier/Language.php';
-require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
-require_once $__dir . '/HTMLPurifier/Length.php';
-require_once $__dir . '/HTMLPurifier/Lexer.php';
-require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
-require_once $__dir . '/HTMLPurifier/PropertyList.php';
-require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
-require_once $__dir . '/HTMLPurifier/Strategy.php';
-require_once $__dir . '/HTMLPurifier/StringHash.php';
-require_once $__dir . '/HTMLPurifier/StringHashParser.php';
-require_once $__dir . '/HTMLPurifier/TagTransform.php';
-require_once $__dir . '/HTMLPurifier/Token.php';
-require_once $__dir . '/HTMLPurifier/TokenFactory.php';
-require_once $__dir . '/HTMLPurifier/URI.php';
-require_once $__dir . '/HTMLPurifier/URIDefinition.php';
-require_once $__dir . '/HTMLPurifier/URIFilter.php';
-require_once $__dir . '/HTMLPurifier/URIParser.php';
-require_once $__dir . '/HTMLPurifier/URIScheme.php';
-require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
-require_once $__dir . '/HTMLPurifier/UnitConverter.php';
-require_once $__dir . '/HTMLPurifier/VarParser.php';
-require_once $__dir . '/HTMLPurifier/VarParserException.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
-require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
-require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
-require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
-require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
-require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
-require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
-require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
-require_once $__dir . '/HTMLPurifier/Token/Comment.php';
-require_once $__dir . '/HTMLPurifier/Token/Tag.php';
-require_once $__dir . '/HTMLPurifier/Token/Empty.php';
-require_once $__dir . '/HTMLPurifier/Token/End.php';
-require_once $__dir . '/HTMLPurifier/Token/Start.php';
-require_once $__dir . '/HTMLPurifier/Token/Text.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrCollections.php b/extlib/HTMLPurifier/HTMLPurifier/AttrCollections.php
deleted file mode 100644
index 555b86d04..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrCollections.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * Defines common attribute collections that modules reference
- */
-
-class HTMLPurifier_AttrCollections
-{
-
- /**
- * Associative array of attribute collections, indexed by name
- */
- public $info = array();
-
- /**
- * Performs all expansions on internal data for use by other inclusions
- * It also collects all attribute collection extensions from
- * modules
- * @param $attr_types HTMLPurifier_AttrTypes instance
- * @param $modules Hash array of HTMLPurifier_HTMLModule members
- */
- public function __construct($attr_types, $modules) {
- // load extensions from the modules
- foreach ($modules as $module) {
- foreach ($module->attr_collections as $coll_i => $coll) {
- if (!isset($this->info[$coll_i])) {
- $this->info[$coll_i] = array();
- }
- foreach ($coll as $attr_i => $attr) {
- if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
- // merge in includes
- $this->info[$coll_i][$attr_i] = array_merge(
- $this->info[$coll_i][$attr_i], $attr);
- continue;
- }
- $this->info[$coll_i][$attr_i] = $attr;
- }
- }
- }
- // perform internal expansions and inclusions
- foreach ($this->info as $name => $attr) {
- // merge attribute collections that include others
- $this->performInclusions($this->info[$name]);
- // replace string identifiers with actual attribute objects
- $this->expandIdentifiers($this->info[$name], $attr_types);
- }
- }
-
- /**
- * Takes a reference to an attribute associative array and performs
- * all inclusions specified by the zero index.
- * @param &$attr Reference to attribute array
- */
- public function performInclusions(&$attr) {
- if (!isset($attr[0])) return;
- $merge = $attr[0];
- $seen = array(); // recursion guard
- // loop through all the inclusions
- for ($i = 0; isset($merge[$i]); $i++) {
- if (isset($seen[$merge[$i]])) continue;
- $seen[$merge[$i]] = true;
- // foreach attribute of the inclusion, copy it over
- if (!isset($this->info[$merge[$i]])) continue;
- foreach ($this->info[$merge[$i]] as $key => $value) {
- if (isset($attr[$key])) continue; // also catches more inclusions
- $attr[$key] = $value;
- }
- if (isset($this->info[$merge[$i]][0])) {
- // recursion
- $merge = array_merge($merge, $this->info[$merge[$i]][0]);
- }
- }
- unset($attr[0]);
- }
-
- /**
- * Expands all string identifiers in an attribute array by replacing
- * them with the appropriate values inside HTMLPurifier_AttrTypes
- * @param &$attr Reference to attribute array
- * @param $attr_types HTMLPurifier_AttrTypes instance
- */
- public function expandIdentifiers(&$attr, $attr_types) {
-
- // because foreach will process new elements we add, make sure we
- // skip duplicates
- $processed = array();
-
- foreach ($attr as $def_i => $def) {
- // skip inclusions
- if ($def_i === 0) continue;
-
- if (isset($processed[$def_i])) continue;
-
- // determine whether or not attribute is required
- if ($required = (strpos($def_i, '*') !== false)) {
- // rename the definition
- unset($attr[$def_i]);
- $def_i = trim($def_i, '*');
- $attr[$def_i] = $def;
- }
-
- $processed[$def_i] = true;
-
- // if we've already got a literal object, move on
- if (is_object($def)) {
- // preserve previous required
- $attr[$def_i]->required = ($required || $attr[$def_i]->required);
- continue;
- }
-
- if ($def === false) {
- unset($attr[$def_i]);
- continue;
- }
-
- if ($t = $attr_types->get($def)) {
- $attr[$def_i] = $t;
- $attr[$def_i]->required = $required;
- } else {
- unset($attr[$def_i]);
- }
- }
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef.php
deleted file mode 100644
index d32fa62d6..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Base class for all validating attribute definitions.
- *
- * This family of classes forms the core for not only HTML attribute validation,
- * but also any sort of string that needs to be validated or cleaned (which
- * means CSS properties and composite definitions are defined here too).
- * Besides defining (through code) what precisely makes the string valid,
- * subclasses are also responsible for cleaning the code if possible.
- */
-
-abstract class HTMLPurifier_AttrDef
-{
-
- /**
- * Tells us whether or not an HTML attribute is minimized. Has no
- * meaning in other contexts.
- */
- public $minimized = false;
-
- /**
- * Tells us whether or not an HTML attribute is required. Has no
- * meaning in other contexts
- */
- public $required = false;
-
- /**
- * Validates and cleans passed string according to a definition.
- *
- * @param $string String to be validated and cleaned.
- * @param $config Mandatory HTMLPurifier_Config object.
- * @param $context Mandatory HTMLPurifier_AttrContext object.
- */
- abstract public function validate($string, $config, $context);
-
- /**
- * Convenience method that parses a string as if it were CDATA.
- *
- * This method process a string in the manner specified at
- * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
- * leading and trailing whitespace, ignoring line feeds, and replacing
- * carriage returns and tabs with spaces. While most useful for HTML
- * attributes specified as CDATA, it can also be applied to most CSS
- * values.
- *
- * @note This method is not entirely standards compliant, as trim() removes
- * more types of whitespace than specified in the spec. In practice,
- * this is rarely a problem, as those extra characters usually have
- * already been removed by HTMLPurifier_Encoder.
- *
- * @warning This processing is inconsistent with XML's whitespace handling
- * as specified by section 3.3.3 and referenced XHTML 1.0 section
- * 4.7. However, note that we are NOT necessarily
- * parsing XML, thus, this behavior may still be correct. We
- * assume that newlines have been normalized.
- */
- public function parseCDATA($string) {
- $string = trim($string);
- $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
- return $string;
- }
-
- /**
- * Factory method for creating this class from a string.
- * @param $string String construction info
- * @return Created AttrDef object corresponding to $string
- */
- public function make($string) {
- // default implementation, return a flyweight of this object.
- // If $string has an effect on the returned object (i.e. you
- // need to overload this method), it is best
- // to clone or instantiate new copies. (Instantiation is safer.)
- return $this;
- }
-
- /**
- * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
- * properly. THIS IS A HACK!
- */
- protected function mungeRgb($string) {
- return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
deleted file mode 100644
index 953e70675..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute style, otherwise known as CSS.
- * @note We don't implement the whole CSS specification, so it might be
- * difficult to reuse this component in the context of validating
- * actual stylesheet declarations.
- * @note If we were really serious about validating the CSS, we would
- * tokenize the styles and then parse the tokens. Obviously, we
- * are not doing that. Doing that could seriously harm performance,
- * but would make these components a lot more viable for a CSS
- * filtering solution.
- */
-class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
-{
-
- public function validate($css, $config, $context) {
-
- $css = $this->parseCDATA($css);
-
- $definition = $config->getCSSDefinition();
-
- // we're going to break the spec and explode by semicolons.
- // This is because semicolon rarely appears in escaped form
- // Doing this is generally flaky but fast
- // IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
- // for details
-
- $declarations = explode(';', $css);
- $propvalues = array();
-
- /**
- * Name of the current CSS property being validated.
- */
- $property = false;
- $context->register('CurrentCSSProperty', $property);
-
- foreach ($declarations as $declaration) {
- if (!$declaration) continue;
- if (!strpos($declaration, ':')) continue;
- list($property, $value) = explode(':', $declaration, 2);
- $property = trim($property);
- $value = trim($value);
- $ok = false;
- do {
- if (isset($definition->info[$property])) {
- $ok = true;
- break;
- }
- if (ctype_lower($property)) break;
- $property = strtolower($property);
- if (isset($definition->info[$property])) {
- $ok = true;
- break;
- }
- } while(0);
- if (!$ok) continue;
- // inefficient call, since the validator will do this again
- if (strtolower(trim($value)) !== 'inherit') {
- // inherit works for everything (but only on the base property)
- $result = $definition->info[$property]->validate(
- $value, $config, $context );
- } else {
- $result = 'inherit';
- }
- if ($result === false) continue;
- $propvalues[$property] = $result;
- }
-
- $context->destroy('CurrentCSSProperty');
-
- // procedure does not write the new CSS simultaneously, so it's
- // slightly inefficient, but it's the only way of getting rid of
- // duplicates. Perhaps config to optimize it, but not now.
-
- $new_declarations = '';
- foreach ($propvalues as $prop => $value) {
- $new_declarations .= "$prop:$value;";
- }
-
- return $new_declarations ? $new_declarations : false;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
deleted file mode 100644
index 292c040d4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
-{
-
- public function __construct() {
- parent::__construct(false); // opacity is non-negative, but we will clamp it
- }
-
- public function validate($number, $config, $context) {
- $result = parent::validate($number, $config, $context);
- if ($result === false) return $result;
- $float = (float) $result;
- if ($float < 0.0) $result = '0';
- if ($float > 1.0) $result = '1';
- return $result;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
deleted file mode 100644
index 3a3d20cd6..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property background.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of component validators.
- * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
- */
- protected $info;
-
- public function __construct($config) {
- $def = $config->getCSSDefinition();
- $this->info['background-color'] = $def->info['background-color'];
- $this->info['background-image'] = $def->info['background-image'];
- $this->info['background-repeat'] = $def->info['background-repeat'];
- $this->info['background-attachment'] = $def->info['background-attachment'];
- $this->info['background-position'] = $def->info['background-position'];
- }
-
- public function validate($string, $config, $context) {
-
- // regular pre-processing
- $string = $this->parseCDATA($string);
- if ($string === '') return false;
-
- // munge rgb() decl if necessary
- $string = $this->mungeRgb($string);
-
- // assumes URI doesn't have spaces in it
- $bits = explode(' ', strtolower($string)); // bits to process
-
- $caught = array();
- $caught['color'] = false;
- $caught['image'] = false;
- $caught['repeat'] = false;
- $caught['attachment'] = false;
- $caught['position'] = false;
-
- $i = 0; // number of catches
- $none = false;
-
- foreach ($bits as $bit) {
- if ($bit === '') continue;
- foreach ($caught as $key => $status) {
- if ($key != 'position') {
- if ($status !== false) continue;
- $r = $this->info['background-' . $key]->validate($bit, $config, $context);
- } else {
- $r = $bit;
- }
- if ($r === false) continue;
- if ($key == 'position') {
- if ($caught[$key] === false) $caught[$key] = '';
- $caught[$key] .= $r . ' ';
- } else {
- $caught[$key] = $r;
- }
- $i++;
- break;
- }
- }
-
- if (!$i) return false;
- if ($caught['position'] !== false) {
- $caught['position'] = $this->info['background-position']->
- validate($caught['position'], $config, $context);
- }
-
- $ret = array();
- foreach ($caught as $value) {
- if ($value === false) continue;
- $ret[] = $value;
- }
-
- if (empty($ret)) return false;
- return implode(' ', $ret);
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
deleted file mode 100644
index 35df3985e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/* W3C says:
- [ // adjective and number must be in correct order, even if
- // you could switch them without introducing ambiguity.
- // some browsers support that syntax
- [
- <percentage> | <length> | left | center | right
- ]
- [
- <percentage> | <length> | top | center | bottom
- ]?
- ] |
- [ // this signifies that the vertical and horizontal adjectives
- // can be arbitrarily ordered, however, there can only be two,
- // one of each, or none at all
- [
- left | center | right
- ] ||
- [
- top | center | bottom
- ]
- ]
- top, left = 0%
- center, (none) = 50%
- bottom, right = 100%
-*/
-
-/* QuirksMode says:
- keyword + length/percentage must be ordered correctly, as per W3C
-
- Internet Explorer and Opera, however, support arbitrary ordering. We
- should fix it up.
-
- Minor issue though, not strictly necessary.
-*/
-
-// control freaks may appreciate the ability to convert these to
-// percentages or something, but it's not necessary
-
-/**
- * Validates the value of background-position.
- */
-class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
-{
-
- protected $length;
- protected $percentage;
-
- public function __construct() {
- $this->length = new HTMLPurifier_AttrDef_CSS_Length();
- $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
- }
-
- public function validate($string, $config, $context) {
- $string = $this->parseCDATA($string);
- $bits = explode(' ', $string);
-
- $keywords = array();
- $keywords['h'] = false; // left, right
- $keywords['v'] = false; // top, bottom
- $keywords['c'] = false; // center
- $measures = array();
-
- $i = 0;
-
- $lookup = array(
- 'top' => 'v',
- 'bottom' => 'v',
- 'left' => 'h',
- 'right' => 'h',
- 'center' => 'c'
- );
-
- foreach ($bits as $bit) {
- if ($bit === '') continue;
-
- // test for keyword
- $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
- if (isset($lookup[$lbit])) {
- $status = $lookup[$lbit];
- $keywords[$status] = $lbit;
- $i++;
- }
-
- // test for length
- $r = $this->length->validate($bit, $config, $context);
- if ($r !== false) {
- $measures[] = $r;
- $i++;
- }
-
- // test for percentage
- $r = $this->percentage->validate($bit, $config, $context);
- if ($r !== false) {
- $measures[] = $r;
- $i++;
- }
-
- }
-
- if (!$i) return false; // no valid values were caught
-
-
- $ret = array();
-
- // first keyword
- if ($keywords['h']) $ret[] = $keywords['h'];
- elseif (count($measures)) $ret[] = array_shift($measures);
- elseif ($keywords['c']) {
- $ret[] = $keywords['c'];
- $keywords['c'] = false; // prevent re-use: center = center center
- }
-
- if ($keywords['v']) $ret[] = $keywords['v'];
- elseif (count($measures)) $ret[] = array_shift($measures);
- elseif ($keywords['c']) $ret[] = $keywords['c'];
-
- if (empty($ret)) return false;
- return implode(' ', $ret);
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
deleted file mode 100644
index 42a1d1b4a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Validates the border property as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of properties this property is shorthand for.
- */
- protected $info = array();
-
- public function __construct($config) {
- $def = $config->getCSSDefinition();
- $this->info['border-width'] = $def->info['border-width'];
- $this->info['border-style'] = $def->info['border-style'];
- $this->info['border-top-color'] = $def->info['border-top-color'];
- }
-
- public function validate($string, $config, $context) {
- $string = $this->parseCDATA($string);
- $string = $this->mungeRgb($string);
- $bits = explode(' ', $string);
- $done = array(); // segments we've finished
- $ret = ''; // return value
- foreach ($bits as $bit) {
- foreach ($this->info as $propname => $validator) {
- if (isset($done[$propname])) continue;
- $r = $validator->validate($bit, $config, $context);
- if ($r !== false) {
- $ret .= $r . ' ';
- $done[$propname] = true;
- break;
- }
- }
- }
- return rtrim($ret);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
deleted file mode 100644
index 07f95a671..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Validates Color as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
-{
-
- public function validate($color, $config, $context) {
-
- static $colors = null;
- if ($colors === null) $colors = $config->get('Core.ColorKeywords');
-
- $color = trim($color);
- if ($color === '') return false;
-
- $lower = strtolower($color);
- if (isset($colors[$lower])) return $colors[$lower];
-
- if (strpos($color, 'rgb(') !== false) {
- // rgb literal handling
- $length = strlen($color);
- if (strpos($color, ')') !== $length - 1) return false;
- $triad = substr($color, 4, $length - 4 - 1);
- $parts = explode(',', $triad);
- if (count($parts) !== 3) return false;
- $type = false; // to ensure that they're all the same type
- $new_parts = array();
- foreach ($parts as $part) {
- $part = trim($part);
- if ($part === '') return false;
- $length = strlen($part);
- if ($part[$length - 1] === '%') {
- // handle percents
- if (!$type) {
- $type = 'percentage';
- } elseif ($type !== 'percentage') {
- return false;
- }
- $num = (float) substr($part, 0, $length - 1);
- if ($num < 0) $num = 0;
- if ($num > 100) $num = 100;
- $new_parts[] = "$num%";
- } else {
- // handle integers
- if (!$type) {
- $type = 'integer';
- } elseif ($type !== 'integer') {
- return false;
- }
- $num = (int) $part;
- if ($num < 0) $num = 0;
- if ($num > 255) $num = 255;
- $new_parts[] = (string) $num;
- }
- }
- $new_triad = implode(',', $new_parts);
- $color = "rgb($new_triad)";
- } else {
- // hexadecimal handling
- if ($color[0] === '#') {
- $hex = substr($color, 1);
- } else {
- $hex = $color;
- $color = '#' . $color;
- }
- $length = strlen($hex);
- if ($length !== 3 && $length !== 6) return false;
- if (!ctype_xdigit($hex)) return false;
- }
-
- return $color;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
deleted file mode 100644
index de1289cba..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Allows multiple validators to attempt to validate attribute.
- *
- * Composite is just what it sounds like: a composite of many validators.
- * This means that multiple HTMLPurifier_AttrDef objects will have a whack
- * at the string. If one of them passes, that's what is returned. This is
- * especially useful for CSS values, which often are a choice between
- * an enumerated set of predefined values or a flexible data type.
- */
-class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
-{
-
- /**
- * List of HTMLPurifier_AttrDef objects that may process strings
- * @todo Make protected
- */
- public $defs;
-
- /**
- * @param $defs List of HTMLPurifier_AttrDef objects
- */
- public function __construct($defs) {
- $this->defs = $defs;
- }
-
- public function validate($string, $config, $context) {
- foreach ($this->defs as $i => $def) {
- $result = $this->defs[$i]->validate($string, $config, $context);
- if ($result !== false) return $result;
- }
- return false;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
deleted file mode 100644
index 6599c5b2d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Decorator which enables CSS properties to be disabled for specific elements.
- */
-class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
-{
- public $def, $element;
-
- /**
- * @param $def Definition to wrap
- * @param $element Element to deny
- */
- public function __construct($def, $element) {
- $this->def = $def;
- $this->element = $element;
- }
- /**
- * Checks if CurrentToken is set and equal to $this->element
- */
- public function validate($string, $config, $context) {
- $token = $context->get('CurrentToken', true);
- if ($token && $token->name == $this->element) return false;
- return $this->def->validate($string, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
deleted file mode 100644
index 147894b86..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Microsoft's proprietary filter: CSS property
- * @note Currently supports the alpha filter. In the future, this will
- * probably need an extensible framework
- */
-class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
-{
-
- protected $intValidator;
-
- public function __construct() {
- $this->intValidator = new HTMLPurifier_AttrDef_Integer();
- }
-
- public function validate($value, $config, $context) {
- $value = $this->parseCDATA($value);
- if ($value === 'none') return $value;
- // if we looped this we could support multiple filters
- $function_length = strcspn($value, '(');
- $function = trim(substr($value, 0, $function_length));
- if ($function !== 'alpha' &&
- $function !== 'Alpha' &&
- $function !== 'progid:DXImageTransform.Microsoft.Alpha'
- ) return false;
- $cursor = $function_length + 1;
- $parameters_length = strcspn($value, ')', $cursor);
- $parameters = substr($value, $cursor, $parameters_length);
- $params = explode(',', $parameters);
- $ret_params = array();
- $lookup = array();
- foreach ($params as $param) {
- list($key, $value) = explode('=', $param);
- $key = trim($key);
- $value = trim($value);
- if (isset($lookup[$key])) continue;
- if ($key !== 'opacity') continue;
- $value = $this->intValidator->validate($value, $config, $context);
- if ($value === false) continue;
- $int = (int) $value;
- if ($int > 100) $value = '100';
- if ($int < 0) $value = '0';
- $ret_params[] = "$key=$value";
- $lookup[$key] = true;
- }
- $ret_parameters = implode(',', $ret_params);
- $ret_function = "$function($ret_parameters)";
- return $ret_function;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
deleted file mode 100644
index 699ee0b70..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property font.
- */
-class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of component validators.
- *
- * @note If we moved specific CSS property definitions to their own
- * classes instead of having them be assembled at run time by
- * CSSDefinition, this wouldn't be necessary. We'd instantiate
- * our own copies.
- */
- protected $info = array();
-
- public function __construct($config) {
- $def = $config->getCSSDefinition();
- $this->info['font-style'] = $def->info['font-style'];
- $this->info['font-variant'] = $def->info['font-variant'];
- $this->info['font-weight'] = $def->info['font-weight'];
- $this->info['font-size'] = $def->info['font-size'];
- $this->info['line-height'] = $def->info['line-height'];
- $this->info['font-family'] = $def->info['font-family'];
- }
-
- public function validate($string, $config, $context) {
-
- static $system_fonts = array(
- 'caption' => true,
- 'icon' => true,
- 'menu' => true,
- 'message-box' => true,
- 'small-caption' => true,
- 'status-bar' => true
- );
-
- // regular pre-processing
- $string = $this->parseCDATA($string);
- if ($string === '') return false;
-
- // check if it's one of the keywords
- $lowercase_string = strtolower($string);
- if (isset($system_fonts[$lowercase_string])) {
- return $lowercase_string;
- }
-
- $bits = explode(' ', $string); // bits to process
- $stage = 0; // this indicates what we're looking for
- $caught = array(); // which stage 0 properties have we caught?
- $stage_1 = array('font-style', 'font-variant', 'font-weight');
- $final = ''; // output
-
- for ($i = 0, $size = count($bits); $i < $size; $i++) {
- if ($bits[$i] === '') continue;
- switch ($stage) {
-
- // attempting to catch font-style, font-variant or font-weight
- case 0:
- foreach ($stage_1 as $validator_name) {
- if (isset($caught[$validator_name])) continue;
- $r = $this->info[$validator_name]->validate(
- $bits[$i], $config, $context);
- if ($r !== false) {
- $final .= $r . ' ';
- $caught[$validator_name] = true;
- break;
- }
- }
- // all three caught, continue on
- if (count($caught) >= 3) $stage = 1;
- if ($r !== false) break;
-
- // attempting to catch font-size and perhaps line-height
- case 1:
- $found_slash = false;
- if (strpos($bits[$i], '/') !== false) {
- list($font_size, $line_height) =
- explode('/', $bits[$i]);
- if ($line_height === '') {
- // ooh, there's a space after the slash!
- $line_height = false;
- $found_slash = true;
- }
- } else {
- $font_size = $bits[$i];
- $line_height = false;
- }
- $r = $this->info['font-size']->validate(
- $font_size, $config, $context);
- if ($r !== false) {
- $final .= $r;
- // attempt to catch line-height
- if ($line_height === false) {
- // we need to scroll forward
- for ($j = $i + 1; $j < $size; $j++) {
- if ($bits[$j] === '') continue;
- if ($bits[$j] === '/') {
- if ($found_slash) {
- return false;
- } else {
- $found_slash = true;
- continue;
- }
- }
- $line_height = $bits[$j];
- break;
- }
- } else {
- // slash already found
- $found_slash = true;
- $j = $i;
- }
- if ($found_slash) {
- $i = $j;
- $r = $this->info['line-height']->validate(
- $line_height, $config, $context);
- if ($r !== false) {
- $final .= '/' . $r;
- }
- }
- $final .= ' ';
- $stage = 2;
- break;
- }
- return false;
-
- // attempting to catch font-family
- case 2:
- $font_family =
- implode(' ', array_slice($bits, $i, $size - $i));
- $r = $this->info['font-family']->validate(
- $font_family, $config, $context);
- if ($r !== false) {
- $final .= $r . ' ';
- // processing completed successfully
- return rtrim($final);
- }
- return false;
- }
- }
- return false;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
deleted file mode 100644
index 705ac893d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Validates a font family list according to CSS spec
- * @todo whitelisting allowed fonts would be nice
- */
-class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
-{
-
- public function validate($string, $config, $context) {
- static $generic_names = array(
- 'serif' => true,
- 'sans-serif' => true,
- 'monospace' => true,
- 'fantasy' => true,
- 'cursive' => true
- );
-
- // assume that no font names contain commas in them
- $fonts = explode(',', $string);
- $final = '';
- foreach($fonts as $font) {
- $font = trim($font);
- if ($font === '') continue;
- // match a generic name
- if (isset($generic_names[$font])) {
- $final .= $font . ', ';
- continue;
- }
- // match a quoted name
- if ($font[0] === '"' || $font[0] === "'") {
- $length = strlen($font);
- if ($length <= 2) continue;
- $quote = $font[0];
- if ($font[$length - 1] !== $quote) continue;
- $font = substr($font, 1, $length - 2);
-
- $new_font = '';
- for ($i = 0, $c = strlen($font); $i < $c; $i++) {
- if ($font[$i] === '\\') {
- $i++;
- if ($i >= $c) {
- $new_font .= '\\';
- break;
- }
- if (ctype_xdigit($font[$i])) {
- $code = $font[$i];
- for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
- if (!ctype_xdigit($font[$i])) break;
- $code .= $font[$i];
- }
- // We have to be extremely careful when adding
- // new characters, to make sure we're not breaking
- // the encoding.
- $char = HTMLPurifier_Encoder::unichr(hexdec($code));
- if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
- $new_font .= $char;
- if ($i < $c && trim($font[$i]) !== '') $i--;
- continue;
- }
- if ($font[$i] === "\n") continue;
- }
- $new_font .= $font[$i];
- }
-
- $font = $new_font;
- }
- // $font is a pure representation of the font name
-
- if (ctype_alnum($font) && $font !== '') {
- // very simple font, allow it in unharmed
- $final .= $font . ', ';
- continue;
- }
-
- // complicated font, requires quoting
-
- // armor single quotes and new lines
- $font = str_replace("\\", "\\\\", $font);
- $font = str_replace("'", "\\'", $font);
- $final .= "'$font', ";
- }
- $final = rtrim($final, ', ');
- if ($final === '') return false;
- return $final;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
deleted file mode 100644
index 4e6b35e5a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Decorator which enables !important to be used in CSS values.
- */
-class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
-{
- public $def, $allow;
-
- /**
- * @param $def Definition to wrap
- * @param $allow Whether or not to allow !important
- */
- public function __construct($def, $allow = false) {
- $this->def = $def;
- $this->allow = $allow;
- }
- /**
- * Intercepts and removes !important if necessary
- */
- public function validate($string, $config, $context) {
- // test for ! and important tokens
- $string = trim($string);
- $is_important = false;
- // :TODO: optimization: test directly for !important and ! important
- if (strlen($string) >= 9 && substr($string, -9) === 'important') {
- $temp = rtrim(substr($string, 0, -9));
- // use a temp, because we might want to restore important
- if (strlen($temp) >= 1 && substr($temp, -1) === '!') {
- $string = rtrim(substr($temp, 0, -1));
- $is_important = true;
- }
- }
- $string = $this->def->validate($string, $config, $context);
- if ($this->allow && $is_important) $string .= ' !important';
- return $string;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
deleted file mode 100644
index a07ec5813..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Represents a Length as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
-{
-
- protected $min, $max;
-
- /**
- * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
- * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
- */
- public function __construct($min = null, $max = null) {
- $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
- $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
- }
-
- public function validate($string, $config, $context) {
- $string = $this->parseCDATA($string);
-
- // Optimizations
- if ($string === '') return false;
- if ($string === '0') return '0';
- if (strlen($string) === 1) return false;
-
- $length = HTMLPurifier_Length::make($string);
- if (!$length->isValid()) return false;
-
- if ($this->min) {
- $c = $length->compareTo($this->min);
- if ($c === false) return false;
- if ($c < 0) return false;
- }
- if ($this->max) {
- $c = $length->compareTo($this->max);
- if ($c === false) return false;
- if ($c > 0) return false;
- }
-
- return $length->toString();
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
deleted file mode 100644
index 4406868c0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property list-style.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
-{
-
- /**
- * Local copy of component validators.
- * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
- */
- protected $info;
-
- public function __construct($config) {
- $def = $config->getCSSDefinition();
- $this->info['list-style-type'] = $def->info['list-style-type'];
- $this->info['list-style-position'] = $def->info['list-style-position'];
- $this->info['list-style-image'] = $def->info['list-style-image'];
- }
-
- public function validate($string, $config, $context) {
-
- // regular pre-processing
- $string = $this->parseCDATA($string);
- if ($string === '') return false;
-
- // assumes URI doesn't have spaces in it
- $bits = explode(' ', strtolower($string)); // bits to process
-
- $caught = array();
- $caught['type'] = false;
- $caught['position'] = false;
- $caught['image'] = false;
-
- $i = 0; // number of catches
- $none = false;
-
- foreach ($bits as $bit) {
- if ($i >= 3) return; // optimization bit
- if ($bit === '') continue;
- foreach ($caught as $key => $status) {
- if ($status !== false) continue;
- $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
- if ($r === false) continue;
- if ($r === 'none') {
- if ($none) continue;
- else $none = true;
- if ($key == 'image') continue;
- }
- $caught[$key] = $r;
- $i++;
- break;
- }
- }
-
- if (!$i) return false;
-
- $ret = array();
-
- // construct type
- if ($caught['type']) $ret[] = $caught['type'];
-
- // construct image
- if ($caught['image']) $ret[] = $caught['image'];
-
- // construct position
- if ($caught['position']) $ret[] = $caught['position'];
-
- if (empty($ret)) return false;
- return implode(' ', $ret);
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
deleted file mode 100644
index 4d62a40d7..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Framework class for strings that involve multiple values.
- *
- * Certain CSS properties such as border-width and margin allow multiple
- * lengths to be specified. This class can take a vanilla border-width
- * definition and multiply it, usually into a max of four.
- *
- * @note Even though the CSS specification isn't clear about it, inherit
- * can only be used alone: it will never manifest as part of a multi
- * shorthand declaration. Thus, this class does not allow inherit.
- */
-class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
-{
-
- /**
- * Instance of component definition to defer validation to.
- * @todo Make protected
- */
- public $single;
-
- /**
- * Max number of values allowed.
- * @todo Make protected
- */
- public $max;
-
- /**
- * @param $single HTMLPurifier_AttrDef to multiply
- * @param $max Max number of values allowed (usually four)
- */
- public function __construct($single, $max = 4) {
- $this->single = $single;
- $this->max = $max;
- }
-
- public function validate($string, $config, $context) {
- $string = $this->parseCDATA($string);
- if ($string === '') return false;
- $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
- $length = count($parts);
- $final = '';
- for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
- if (ctype_space($parts[$i])) continue;
- $result = $this->single->validate($parts[$i], $config, $context);
- if ($result !== false) {
- $final .= $result . ' ';
- $num++;
- }
- }
- if ($final === '') return false;
- return rtrim($final);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
deleted file mode 100644
index 3f99e12ec..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Validates a number as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
-{
-
- /**
- * Bool indicating whether or not only positive values allowed.
- */
- protected $non_negative = false;
-
- /**
- * @param $non_negative Bool indicating whether negatives are forbidden
- */
- public function __construct($non_negative = false) {
- $this->non_negative = $non_negative;
- }
-
- /**
- * @warning Some contexts do not pass $config, $context. These
- * variables should not be used without checking HTMLPurifier_Length
- */
- public function validate($number, $config, $context) {
-
- $number = $this->parseCDATA($number);
-
- if ($number === '') return false;
- if ($number === '0') return '0';
-
- $sign = '';
- switch ($number[0]) {
- case '-':
- if ($this->non_negative) return false;
- $sign = '-';
- case '+':
- $number = substr($number, 1);
- }
-
- if (ctype_digit($number)) {
- $number = ltrim($number, '0');
- return $number ? $sign . $number : '0';
- }
-
- // Period is the only non-numeric character allowed
- if (strpos($number, '.') === false) return false;
-
- list($left, $right) = explode('.', $number, 2);
-
- if ($left === '' && $right === '') return false;
- if ($left !== '' && !ctype_digit($left)) return false;
-
- $left = ltrim($left, '0');
- $right = rtrim($right, '0');
-
- if ($right === '') {
- return $left ? $sign . $left : '0';
- } elseif (!ctype_digit($right)) {
- return false;
- }
-
- return $sign . $left . '.' . $right;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
deleted file mode 100644
index c34b8fc3c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Validates a Percentage as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
-{
-
- /**
- * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
- */
- protected $number_def;
-
- /**
- * @param Bool indicating whether to forbid negative values
- */
- public function __construct($non_negative = false) {
- $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
- }
-
- public function validate($string, $config, $context) {
-
- $string = $this->parseCDATA($string);
-
- if ($string === '') return false;
- $length = strlen($string);
- if ($length === 1) return false;
- if ($string[$length - 1] !== '%') return false;
-
- $number = substr($string, 0, $length - 1);
- $number = $this->number_def->validate($number, $config, $context);
-
- if ($number === false) return false;
- return "$number%";
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
deleted file mode 100644
index 772c922d8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Validates the value for the CSS property text-decoration
- * @note This class could be generalized into a version that acts sort of
- * like Enum except you can compound the allowed values.
- */
-class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
-{
-
- public function validate($string, $config, $context) {
-
- static $allowed_values = array(
- 'line-through' => true,
- 'overline' => true,
- 'underline' => true,
- );
-
- $string = strtolower($this->parseCDATA($string));
-
- if ($string === 'none') return $string;
-
- $parts = explode(' ', $string);
- $final = '';
- foreach ($parts as $part) {
- if (isset($allowed_values[$part])) {
- $final .= $part . ' ';
- }
- }
- $final = rtrim($final);
- if ($final === '') return false;
- return $final;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
deleted file mode 100644
index 435d7930b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Validates a URI in CSS syntax, which uses url('http://example.com')
- * @note While theoretically speaking a URI in a CSS document could
- * be non-embedded, as of CSS2 there is no such usage so we're
- * generalizing it. This may need to be changed in the future.
- * @warning Since HTMLPurifier_AttrDef_CSS blindly uses semicolons as
- * the separator, you cannot put a literal semicolon in
- * in the URI. Try percent encoding it, in that case.
- */
-class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
-{
-
- public function __construct() {
- parent::__construct(true); // always embedded
- }
-
- public function validate($uri_string, $config, $context) {
- // parse the URI out of the string and then pass it onto
- // the parent object
-
- $uri_string = $this->parseCDATA($uri_string);
- if (strpos($uri_string, 'url(') !== 0) return false;
- $uri_string = substr($uri_string, 4);
- $new_length = strlen($uri_string) - 1;
- if ($uri_string[$new_length] != ')') return false;
- $uri = trim(substr($uri_string, 0, $new_length));
-
- if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
- $quote = $uri[0];
- $new_length = strlen($uri) - 1;
- if ($uri[$new_length] !== $quote) return false;
- $uri = substr($uri, 1, $new_length - 1);
- }
-
- $keys = array( '(', ')', ',', ' ', '"', "'");
- $values = array('\\(', '\\)', '\\,', '\\ ', '\\"', "\\'");
- $uri = str_replace($values, $keys, $uri);
-
- $result = parent::validate($uri, $config, $context);
-
- if ($result === false) return false;
-
- // escape necessary characters according to CSS spec
- // except for the comma, none of these should appear in the
- // URI at all
- $result = str_replace($keys, $values, $result);
-
- return "url($result)";
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
deleted file mode 100644
index 5d603ebcc..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-// Enum = Enumerated
-/**
- * Validates a keyword against a list of valid values.
- * @warning The case-insensitive compare of this function uses PHP's
- * built-in strtolower and ctype_lower functions, which may
- * cause problems with international comparisons
- */
-class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
-{
-
- /**
- * Lookup table of valid values.
- * @todo Make protected
- */
- public $valid_values = array();
-
- /**
- * Bool indicating whether or not enumeration is case sensitive.
- * @note In general this is always case insensitive.
- */
- protected $case_sensitive = false; // values according to W3C spec
-
- /**
- * @param $valid_values List of valid values
- * @param $case_sensitive Bool indicating whether or not case sensitive
- */
- public function __construct(
- $valid_values = array(), $case_sensitive = false
- ) {
- $this->valid_values = array_flip($valid_values);
- $this->case_sensitive = $case_sensitive;
- }
-
- public function validate($string, $config, $context) {
- $string = trim($string);
- if (!$this->case_sensitive) {
- // we may want to do full case-insensitive libraries
- $string = ctype_lower($string) ? $string : strtolower($string);
- }
- $result = isset($this->valid_values[$string]);
-
- return $result ? $string : false;
- }
-
- /**
- * @param $string In form of comma-delimited list of case-insensitive
- * valid values. Example: "foo,bar,baz". Prepend "s:" to make
- * case sensitive
- */
- public function make($string) {
- if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
- $string = substr($string, 2);
- $sensitive = true;
- } else {
- $sensitive = false;
- }
- $values = explode(',', $string);
- return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
deleted file mode 100644
index e06987eb8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Validates a boolean attribute
- */
-class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
-{
-
- protected $name;
- public $minimized = true;
-
- public function __construct($name = false) {$this->name = $name;}
-
- public function validate($string, $config, $context) {
- if (empty($string)) return false;
- return $this->name;
- }
-
- /**
- * @param $string Name of attribute
- */
- public function make($string) {
- return new HTMLPurifier_AttrDef_HTML_Bool($string);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
deleted file mode 100644
index 370068d97..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Implements special behavior for class attribute (normally NMTOKENS)
- */
-class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
-{
- protected function split($string, $config, $context) {
- // really, this twiddle should be lazy loaded
- $name = $config->getDefinition('HTML')->doctype->name;
- if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
- return parent::split($string, $config, $context);
- } else {
- return preg_split('/\s+/', $string);
- }
- }
- protected function filter($tokens, $config, $context) {
- $allowed = $config->get('Attr.AllowedClasses');
- $forbidden = $config->get('Attr.ForbiddenClasses');
- $ret = array();
- foreach ($tokens as $token) {
- if (
- ($allowed === null || isset($allowed[$token])) &&
- !isset($forbidden[$token]) &&
- // We need this O(n) check because of PHP's array
- // implementation that casts -0 to 0.
- !in_array($token, $ret, true)
- ) {
- $ret[] = $token;
- }
- }
- return $ret;
- }
-}
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
deleted file mode 100644
index d01e20454..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Validates a color according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
-{
-
- public function validate($string, $config, $context) {
-
- static $colors = null;
- if ($colors === null) $colors = $config->get('Core.ColorKeywords');
-
- $string = trim($string);
-
- if (empty($string)) return false;
- if (isset($colors[$string])) return $colors[$string];
- if ($string[0] === '#') $hex = substr($string, 1);
- else $hex = $string;
-
- $length = strlen($hex);
- if ($length !== 3 && $length !== 6) return false;
- if (!ctype_xdigit($hex)) return false;
- if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
-
- return "#$hex";
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
deleted file mode 100644
index ae6ea7c01..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Special-case enum attribute definition that lazy loads allowed frame targets
- */
-class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
-{
-
- public $valid_values = false; // uninitialized value
- protected $case_sensitive = false;
-
- public function __construct() {}
-
- public function validate($string, $config, $context) {
- if ($this->valid_values === false) $this->valid_values = $config->get('Attr.AllowedFrameTargets');
- return parent::validate($string, $config, $context);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
deleted file mode 100644
index 81d03762d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute ID.
- * @warning Even though this is the id processor, it
- * will ignore the directive Attr:IDBlacklist, since it will only
- * go according to the ID accumulator. Since the accumulator is
- * automatically generated, it will have already absorbed the
- * blacklist. If you're hacking around, make sure you use load()!
- */
-
-class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
-{
-
- // ref functionality disabled, since we also have to verify
- // whether or not the ID it refers to exists
-
- public function validate($id, $config, $context) {
-
- if (!$config->get('Attr.EnableID')) return false;
-
- $id = trim($id); // trim it first
-
- if ($id === '') return false;
-
- $prefix = $config->get('Attr.IDPrefix');
- if ($prefix !== '') {
- $prefix .= $config->get('Attr.IDPrefixLocal');
- // prevent re-appending the prefix
- if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
- } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
- trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
- '%Attr.IDPrefix is set', E_USER_WARNING);
- }
-
- //if (!$this->ref) {
- $id_accumulator =& $context->get('IDAccumulator');
- if (isset($id_accumulator->ids[$id])) return false;
- //}
-
- // we purposely avoid using regex, hopefully this is faster
-
- if (ctype_alpha($id)) {
- $result = true;
- } else {
- if (!ctype_alpha(@$id[0])) return false;
- $trim = trim( // primitive style of regexps, I suppose
- $id,
- 'A..Za..z0..9:-._'
- );
- $result = ($trim === '');
- }
-
- $regexp = $config->get('Attr.IDBlacklistRegexp');
- if ($regexp && preg_match($regexp, $id)) {
- return false;
- }
-
- if (/*!$this->ref && */$result) $id_accumulator->add($id);
-
- // if no change was made to the ID, return the result
- // else, return the new id if stripping whitespace made it
- // valid, or return false.
- return $result ? $id : false;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
deleted file mode 100644
index a242f9c23..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Validates the HTML type length (not to be confused with CSS's length).
- *
- * This accepts integer pixels or percentages as lengths for certain
- * HTML attributes.
- */
-
-class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
-{
-
- public function validate($string, $config, $context) {
-
- $string = trim($string);
- if ($string === '') return false;
-
- $parent_result = parent::validate($string, $config, $context);
- if ($parent_result !== false) return $parent_result;
-
- $length = strlen($string);
- $last_char = $string[$length - 1];
-
- if ($last_char !== '%') return false;
-
- $points = substr($string, 0, $length - 1);
-
- if (!is_numeric($points)) return false;
-
- $points = (int) $points;
-
- if ($points < 0) return '0%';
- if ($points > 100) return '100%';
-
- return ((string) $points) . '%';
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
deleted file mode 100644
index 76d25ed08..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Validates a rel/rev link attribute against a directive of allowed values
- * @note We cannot use Enum because link types allow multiple
- * values.
- * @note Assumes link types are ASCII text
- */
-class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
-{
-
- /** Name config attribute to pull. */
- protected $name;
-
- public function __construct($name) {
- $configLookup = array(
- 'rel' => 'AllowedRel',
- 'rev' => 'AllowedRev'
- );
- if (!isset($configLookup[$name])) {
- trigger_error('Unrecognized attribute name for link '.
- 'relationship.', E_USER_ERROR);
- return;
- }
- $this->name = $configLookup[$name];
- }
-
- public function validate($string, $config, $context) {
-
- $allowed = $config->get('Attr.' . $this->name);
- if (empty($allowed)) return false;
-
- $string = $this->parseCDATA($string);
- $parts = explode(' ', $string);
-
- // lookup to prevent duplicates
- $ret_lookup = array();
- foreach ($parts as $part) {
- $part = strtolower(trim($part));
- if (!isset($allowed[$part])) continue;
- $ret_lookup[$part] = true;
- }
-
- if (empty($ret_lookup)) return false;
- $string = implode(' ', array_keys($ret_lookup));
-
- return $string;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
deleted file mode 100644
index c72fc76e4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Validates a MultiLength as defined by the HTML spec.
- *
- * A multilength is either a integer (pixel count), a percentage, or
- * a relative number.
- */
-class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
-{
-
- public function validate($string, $config, $context) {
-
- $string = trim($string);
- if ($string === '') return false;
-
- $parent_result = parent::validate($string, $config, $context);
- if ($parent_result !== false) return $parent_result;
-
- $length = strlen($string);
- $last_char = $string[$length - 1];
-
- if ($last_char !== '*') return false;
-
- $int = substr($string, 0, $length - 1);
-
- if ($int == '') return '*';
- if (!is_numeric($int)) return false;
-
- $int = (int) $int;
-
- if ($int < 0) return false;
- if ($int == 0) return '0';
- if ($int == 1) return '*';
- return ((string) $int) . '*';
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
deleted file mode 100644
index aa34120bd..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Validates contents based on NMTOKENS attribute type.
- */
-class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
-{
-
- public function validate($string, $config, $context) {
-
- $string = trim($string);
-
- // early abort: '' and '0' (strings that convert to false) are invalid
- if (!$string) return false;
-
- $tokens = $this->split($string, $config, $context);
- $tokens = $this->filter($tokens, $config, $context);
- if (empty($tokens)) return false;
- return implode(' ', $tokens);
-
- }
-
- /**
- * Splits a space separated list of tokens into its constituent parts.
- */
- protected function split($string, $config, $context) {
- // OPTIMIZABLE!
- // do the preg_match, capture all subpatterns for reformulation
-
- // we don't support U+00A1 and up codepoints or
- // escaping because I don't know how to do that with regexps
- // and plus it would complicate optimization efforts (you never
- // see that anyway).
- $pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
- '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
- '(?:(?=\s)|\z)/'; // look ahead for space or string end
- preg_match_all($pattern, $string, $matches);
- return $matches[1];
- }
-
- /**
- * Template method for removing certain tokens based on arbitrary criteria.
- * @note If we wanted to be really functional, we'd do an array_filter
- * with a callback. But... we're not.
- */
- protected function filter($tokens, $config, $context) {
- return $tokens;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
deleted file mode 100644
index 4cb2c1b85..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Validates an integer representation of pixels according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
-{
-
- protected $max;
-
- public function __construct($max = null) {
- $this->max = $max;
- }
-
- public function validate($string, $config, $context) {
-
- $string = trim($string);
- if ($string === '0') return $string;
- if ($string === '') return false;
- $length = strlen($string);
- if (substr($string, $length - 2) == 'px') {
- $string = substr($string, 0, $length - 2);
- }
- if (!is_numeric($string)) return false;
- $int = (int) $string;
-
- if ($int < 0) return '0';
-
- // upper-bound value, extremely high values can
- // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
- // WARNING, above link WILL crash you if you're using Windows
-
- if ($this->max !== null && $int > $this->max) return (string) $this->max;
-
- return (string) $int;
-
- }
-
- public function make($string) {
- if ($string === '') $max = null;
- else $max = (int) $string;
- $class = get_class($this);
- return new $class($max);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
deleted file mode 100644
index d59738d2a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Validates an integer.
- * @note While this class was modeled off the CSS definition, no currently
- * allowed CSS uses this type. The properties that do are: widows,
- * orphans, z-index, counter-increment, counter-reset. Some of the
- * HTML attributes, however, find use for a non-negative version of this.
- */
-class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
-{
-
- /**
- * Bool indicating whether or not negative values are allowed
- */
- protected $negative = true;
-
- /**
- * Bool indicating whether or not zero is allowed
- */
- protected $zero = true;
-
- /**
- * Bool indicating whether or not positive values are allowed
- */
- protected $positive = true;
-
- /**
- * @param $negative Bool indicating whether or not negative values are allowed
- * @param $zero Bool indicating whether or not zero is allowed
- * @param $positive Bool indicating whether or not positive values are allowed
- */
- public function __construct(
- $negative = true, $zero = true, $positive = true
- ) {
- $this->negative = $negative;
- $this->zero = $zero;
- $this->positive = $positive;
- }
-
- public function validate($integer, $config, $context) {
-
- $integer = $this->parseCDATA($integer);
- if ($integer === '') return false;
-
- // we could possibly simply typecast it to integer, but there are
- // certain fringe cases that must not return an integer.
-
- // clip leading sign
- if ( $this->negative && $integer[0] === '-' ) {
- $digits = substr($integer, 1);
- if ($digits === '0') $integer = '0'; // rm minus sign for zero
- } elseif( $this->positive && $integer[0] === '+' ) {
- $digits = $integer = substr($integer, 1); // rm unnecessary plus
- } else {
- $digits = $integer;
- }
-
- // test if it's numeric
- if (!ctype_digit($digits)) return false;
-
- // perform scope tests
- if (!$this->zero && $integer == 0) return false;
- if (!$this->positive && $integer > 0) return false;
- if (!$this->negative && $integer < 0) return false;
-
- return $integer;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
deleted file mode 100644
index 10e6da56d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute lang, effectively a language code.
- * @note Built according to RFC 3066, which obsoleted RFC 1766
- */
-class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
-{
-
- public function validate($string, $config, $context) {
-
- $string = trim($string);
- if (!$string) return false;
-
- $subtags = explode('-', $string);
- $num_subtags = count($subtags);
-
- if ($num_subtags == 0) return false; // sanity check
-
- // process primary subtag : $subtags[0]
- $length = strlen($subtags[0]);
- switch ($length) {
- case 0:
- return false;
- case 1:
- if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
- return false;
- }
- break;
- case 2:
- case 3:
- if (! ctype_alpha($subtags[0]) ) {
- return false;
- } elseif (! ctype_lower($subtags[0]) ) {
- $subtags[0] = strtolower($subtags[0]);
- }
- break;
- default:
- return false;
- }
-
- $new_string = $subtags[0];
- if ($num_subtags == 1) return $new_string;
-
- // process second subtag : $subtags[1]
- $length = strlen($subtags[1]);
- if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
- return $new_string;
- }
- if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
-
- $new_string .= '-' . $subtags[1];
- if ($num_subtags == 2) return $new_string;
-
- // process all other subtags, index 2 and up
- for ($i = 2; $i < $num_subtags; $i++) {
- $length = strlen($subtags[$i]);
- if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
- return $new_string;
- }
- if (!ctype_lower($subtags[$i])) {
- $subtags[$i] = strtolower($subtags[$i]);
- }
- $new_string .= '-' . $subtags[$i];
- }
-
- return $new_string;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
deleted file mode 100644
index c9e3ed193..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Decorator that, depending on a token, switches between two definitions.
- */
-class HTMLPurifier_AttrDef_Switch
-{
-
- protected $tag;
- protected $withTag, $withoutTag;
-
- /**
- * @param string $tag Tag name to switch upon
- * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
- * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
- */
- public function __construct($tag, $with_tag, $without_tag) {
- $this->tag = $tag;
- $this->withTag = $with_tag;
- $this->withoutTag = $without_tag;
- }
-
- public function validate($string, $config, $context) {
- $token = $context->get('CurrentToken', true);
- if (!$token || $token->name !== $this->tag) {
- return $this->withoutTag->validate($string, $config, $context);
- } else {
- return $this->withTag->validate($string, $config, $context);
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
deleted file mode 100644
index c6216cc53..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Validates arbitrary text according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
-{
-
- public function validate($string, $config, $context) {
- return $this->parseCDATA($string);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
deleted file mode 100644
index 01a6d83e9..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Validates a URI as defined by RFC 3986.
- * @note Scheme-specific mechanics deferred to HTMLPurifier_URIScheme
- */
-class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
-{
-
- protected $parser;
- protected $embedsResource;
-
- /**
- * @param $embeds_resource_resource Does the URI here result in an extra HTTP request?
- */
- public function __construct($embeds_resource = false) {
- $this->parser = new HTMLPurifier_URIParser();
- $this->embedsResource = (bool) $embeds_resource;
- }
-
- public function make($string) {
- $embeds = (bool) $string;
- return new HTMLPurifier_AttrDef_URI($embeds);
- }
-
- public function validate($uri, $config, $context) {
-
- if ($config->get('URI.Disable')) return false;
-
- $uri = $this->parseCDATA($uri);
-
- // parse the URI
- $uri = $this->parser->parse($uri);
- if ($uri === false) return false;
-
- // add embedded flag to context for validators
- $context->register('EmbeddedURI', $this->embedsResource);
-
- $ok = false;
- do {
-
- // generic validation
- $result = $uri->validate($config, $context);
- if (!$result) break;
-
- // chained filtering
- $uri_def = $config->getDefinition('URI');
- $result = $uri_def->filter($uri, $config, $context);
- if (!$result) break;
-
- // scheme-specific validation
- $scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) break;
- if ($this->embedsResource && !$scheme_obj->browsable) break;
- $result = $scheme_obj->validate($uri, $config, $context);
- if (!$result) break;
-
- // Post chained filtering
- $result = $uri_def->postFilter($uri, $config, $context);
- if (!$result) break;
-
- // survived gauntlet
- $ok = true;
-
- } while (false);
-
- $context->destroy('EmbeddedURI');
- if (!$ok) return false;
-
- // back to string
- return $uri->toString();
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
deleted file mode 100644
index bfee9d166..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
-{
-
- /**
- * Unpacks a mailbox into its display-name and address
- */
- function unpack($string) {
- // needs to be implemented
- }
-
-}
-
-// sub-implementations
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
deleted file mode 100644
index 94c715ab4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Primitive email validation class based on the regexp found at
- * http://www.regular-expressions.info/email.html
- */
-class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
-{
-
- public function validate($string, $config, $context) {
- // no support for named mailboxes i.e. "Bob <bob@example.com>"
- // that needs more percent encoding to be done
- if ($string == '') return false;
- $string = trim($string);
- $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
- return $result ? $string : false;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
deleted file mode 100644
index 2156c10c6..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Validates a host according to the IPv4, IPv6 and DNS (future) specifications.
- */
-class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
-{
-
- /**
- * Instance of HTMLPurifier_AttrDef_URI_IPv4 sub-validator
- */
- protected $ipv4;
-
- /**
- * Instance of HTMLPurifier_AttrDef_URI_IPv6 sub-validator
- */
- protected $ipv6;
-
- public function __construct() {
- $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
- $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
- }
-
- public function validate($string, $config, $context) {
- $length = strlen($string);
- if ($string === '') return '';
- if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
- //IPv6
- $ip = substr($string, 1, $length - 2);
- $valid = $this->ipv6->validate($ip, $config, $context);
- if ($valid === false) return false;
- return '['. $valid . ']';
- }
-
- // need to do checks on unusual encodings too
- $ipv4 = $this->ipv4->validate($string, $config, $context);
- if ($ipv4 !== false) return $ipv4;
-
- // A regular domain name.
-
- // This breaks I18N domain names, but we don't have proper IRI support,
- // so force users to insert Punycode. If there's complaining we'll
- // try to fix things into an international friendly form.
-
- // The productions describing this are:
- $a = '[a-z]'; // alpha
- $an = '[a-z0-9]'; // alphanum
- $and = '[a-z0-9-]'; // alphanum | "-"
- // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
- $domainlabel = "$an($and*$an)?";
- // toplabel = alpha | alpha *( alphanum | "-" ) alphanum
- $toplabel = "$a($and*$an)?";
- // hostname = *( domainlabel "." ) toplabel [ "." ]
- $match = preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string);
- if (!$match) return false;
-
- return $string;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
deleted file mode 100644
index ec4cf591b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Validates an IPv4 address
- * @author Feyd @ forums.devnetwork.net (public domain)
- */
-class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
-{
-
- /**
- * IPv4 regex, protected so that IPv6 can reuse it
- */
- protected $ip4;
-
- public function validate($aIP, $config, $context) {
-
- if (!$this->ip4) $this->_loadRegex();
-
- if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
- {
- return $aIP;
- }
-
- return false;
-
- }
-
- /**
- * Lazy load function to prevent regex from being stuffed in
- * cache.
- */
- protected function _loadRegex() {
- $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
- $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
deleted file mode 100644
index 9454e9be5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Validates an IPv6 address.
- * @author Feyd @ forums.devnetwork.net (public domain)
- * @note This function requires brackets to have been removed from address
- * in URI.
- */
-class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
-{
-
- public function validate($aIP, $config, $context) {
-
- if (!$this->ip4) $this->_loadRegex();
-
- $original = $aIP;
-
- $hex = '[0-9a-fA-F]';
- $blk = '(?:' . $hex . '{1,4})';
- $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
-
- // prefix check
- if (strpos($aIP, '/') !== false)
- {
- if (preg_match('#' . $pre . '$#s', $aIP, $find))
- {
- $aIP = substr($aIP, 0, 0-strlen($find[0]));
- unset($find);
- }
- else
- {
- return false;
- }
- }
-
- // IPv4-compatiblity check
- if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
- {
- $aIP = substr($aIP, 0, 0-strlen($find[0]));
- $ip = explode('.', $find[0]);
- $ip = array_map('dechex', $ip);
- $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
- unset($find, $ip);
- }
-
- // compression check
- $aIP = explode('::', $aIP);
- $c = count($aIP);
- if ($c > 2)
- {
- return false;
- }
- elseif ($c == 2)
- {
- list($first, $second) = $aIP;
- $first = explode(':', $first);
- $second = explode(':', $second);
-
- if (count($first) + count($second) > 8)
- {
- return false;
- }
-
- while(count($first) < 8)
- {
- array_push($first, '0');
- }
-
- array_splice($first, 8 - count($second), 8, $second);
- $aIP = $first;
- unset($first,$second);
- }
- else
- {
- $aIP = explode(':', $aIP[0]);
- }
- $c = count($aIP);
-
- if ($c != 8)
- {
- return false;
- }
-
- // All the pieces should be 16-bit hex strings. Are they?
- foreach ($aIP as $piece)
- {
- if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece)))
- {
- return false;
- }
- }
-
- return $original;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform.php
deleted file mode 100644
index e61d3e01b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Processes an entire attribute array for corrections needing multiple values.
- *
- * Occasionally, a certain attribute will need to be removed and popped onto
- * another value. Instead of creating a complex return syntax for
- * HTMLPurifier_AttrDef, we just pass the whole attribute array to a
- * specialized object and have that do the special work. That is the
- * family of HTMLPurifier_AttrTransform.
- *
- * An attribute transformation can be assigned to run before or after
- * HTMLPurifier_AttrDef validation. See HTMLPurifier_HTMLDefinition for
- * more details.
- */
-
-abstract class HTMLPurifier_AttrTransform
-{
-
- /**
- * Abstract: makes changes to the attributes dependent on multiple values.
- *
- * @param $attr Assoc array of attributes, usually from
- * HTMLPurifier_Token_Tag::$attr
- * @param $config Mandatory HTMLPurifier_Config object.
- * @param $context Mandatory HTMLPurifier_Context object
- * @returns Processed attribute array.
- */
- abstract public function transform($attr, $config, $context);
-
- /**
- * Prepends CSS properties to the style attribute, creating the
- * attribute if it doesn't exist.
- * @param $attr Attribute array to process (passed by reference)
- * @param $css CSS to prepend
- */
- public function prependCSS(&$attr, $css) {
- $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
- $attr['style'] = $css . $attr['style'];
- }
-
- /**
- * Retrieves and removes an attribute
- * @param $attr Attribute array to process (passed by reference)
- * @param $key Key of attribute to confiscate
- */
- public function confiscateAttr(&$attr, $key) {
- if (!isset($attr[$key])) return null;
- $value = $attr[$key];
- unset($attr[$key]);
- return $value;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
deleted file mode 100644
index 0e1ff24a3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes proprietary background attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform {
-
- public function transform($attr, $config, $context) {
-
- if (!isset($attr['background'])) return $attr;
-
- $background = $this->confiscateAttr($attr, 'background');
- // some validation should happen here
-
- $this->prependCSS($attr, "background-image:url($background);");
-
- return $attr;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
deleted file mode 100644
index 4d1a05665..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-// this MUST be placed in post, as it assumes that any value in dir is valid
-
-/**
- * Post-trasnform that ensures that bdo tags have the dir attribute set.
- */
-class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
-{
-
- public function transform($attr, $config, $context) {
- if (isset($attr['dir'])) return $attr;
- $attr['dir'] = $config->get('Attr.DefaultTextDir');
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
deleted file mode 100644
index ad3916bb9..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated bgcolor attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform {
-
- public function transform($attr, $config, $context) {
-
- if (!isset($attr['bgcolor'])) return $attr;
-
- $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
- // some validation should happen here
-
- $this->prependCSS($attr, "background-color:$bgcolor;");
-
- return $attr;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
deleted file mode 100644
index 51159b671..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes converts a boolean attribute to fixed CSS
- */
-class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform {
-
- /**
- * Name of boolean attribute that is trigger
- */
- protected $attr;
-
- /**
- * CSS declarations to add to style, needs trailing semicolon
- */
- protected $css;
-
- /**
- * @param $attr string attribute name to convert from
- * @param $css string CSS declarations to add to style (needs semicolon)
- */
- public function __construct($attr, $css) {
- $this->attr = $attr;
- $this->css = $css;
- }
-
- public function transform($attr, $config, $context) {
- if (!isset($attr[$this->attr])) return $attr;
- unset($attr[$this->attr]);
- $this->prependCSS($attr, $this->css);
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
deleted file mode 100644
index 476b0b079..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated border attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {
-
- public function transform($attr, $config, $context) {
- if (!isset($attr['border'])) return $attr;
- $border_width = $this->confiscateAttr($attr, 'border');
- // some validation should happen here
- $this->prependCSS($attr, "border:{$border_width}px solid;");
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
deleted file mode 100644
index 2a5b4514a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Generic pre-transform that converts an attribute with a fixed number of
- * values (enumerated) to CSS.
- */
-class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {
-
- /**
- * Name of attribute to transform from
- */
- protected $attr;
-
- /**
- * Lookup array of attribute values to CSS
- */
- protected $enumToCSS = array();
-
- /**
- * Case sensitivity of the matching
- * @warning Currently can only be guaranteed to work with ASCII
- * values.
- */
- protected $caseSensitive = false;
-
- /**
- * @param $attr String attribute name to transform from
- * @param $enumToCSS Lookup array of attribute values to CSS
- * @param $case_sensitive Boolean case sensitivity indicator, default false
- */
- public function __construct($attr, $enum_to_css, $case_sensitive = false) {
- $this->attr = $attr;
- $this->enumToCSS = $enum_to_css;
- $this->caseSensitive = (bool) $case_sensitive;
- }
-
- public function transform($attr, $config, $context) {
-
- if (!isset($attr[$this->attr])) return $attr;
-
- $value = trim($attr[$this->attr]);
- unset($attr[$this->attr]);
-
- if (!$this->caseSensitive) $value = strtolower($value);
-
- if (!isset($this->enumToCSS[$value])) {
- return $attr;
- }
-
- $this->prependCSS($attr, $this->enumToCSS[$value]);
-
- return $attr;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
deleted file mode 100644
index a219479a0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Transform that supplies default values for the src and alt attributes
- * in img tags, as well as prevents the img tag from being removed
- * because of a missing alt tag. This needs to be registered as both
- * a pre and post attribute transform.
- */
-class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
-{
-
- public function transform($attr, $config, $context) {
-
- $src = true;
- if (!isset($attr['src'])) {
- if ($config->get('Core.RemoveInvalidImg')) return $attr;
- $attr['src'] = $config->get('Attr.DefaultInvalidImage');
- $src = false;
- }
-
- if (!isset($attr['alt'])) {
- if ($src) {
- $alt = $config->get('Attr.DefaultImageAlt');
- if ($alt === null) {
- $attr['alt'] = basename($attr['src']);
- } else {
- $attr['alt'] = $alt;
- }
- } else {
- $attr['alt'] = $config->get('Attr.DefaultInvalidImageAlt');
- }
- }
-
- return $attr;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
deleted file mode 100644
index fd84c10c3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated hspace and vspace attributes to CSS
- */
-class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform {
-
- protected $attr;
- protected $css = array(
- 'hspace' => array('left', 'right'),
- 'vspace' => array('top', 'bottom')
- );
-
- public function __construct($attr) {
- $this->attr = $attr;
- if (!isset($this->css[$attr])) {
- trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
- }
- }
-
- public function transform($attr, $config, $context) {
-
- if (!isset($attr[$this->attr])) return $attr;
-
- $width = $this->confiscateAttr($attr, $this->attr);
- // some validation could happen here
-
- if (!isset($this->css[$this->attr])) return $attr;
-
- $style = '';
- foreach ($this->css[$this->attr] as $suffix) {
- $property = "margin-$suffix";
- $style .= "$property:{$width}px;";
- }
-
- $this->prependCSS($attr, $style);
-
- return $attr;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
deleted file mode 100644
index 16829552d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Performs miscellaneous cross attribute validation and filtering for
- * input elements. This is meant to be a post-transform.
- */
-class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform {
-
- protected $pixels;
-
- public function __construct() {
- $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
- }
-
- public function transform($attr, $config, $context) {
- if (!isset($attr['type'])) $t = 'text';
- else $t = strtolower($attr['type']);
- if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
- unset($attr['checked']);
- }
- if (isset($attr['maxlength']) && $t !== 'text' && $t !== 'password') {
- unset($attr['maxlength']);
- }
- if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
- $result = $this->pixels->validate($attr['size'], $config, $context);
- if ($result === false) unset($attr['size']);
- else $attr['size'] = $result;
- }
- if (isset($attr['src']) && $t !== 'image') {
- unset($attr['src']);
- }
- if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {
- $attr['value'] = '';
- }
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
deleted file mode 100644
index 5869e7f82..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Post-transform that copies lang's value to xml:lang (and vice-versa)
- * @note Theoretically speaking, this could be a pre-transform, but putting
- * post is more efficient.
- */
-class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
-{
-
- public function transform($attr, $config, $context) {
-
- $lang = isset($attr['lang']) ? $attr['lang'] : false;
- $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;
-
- if ($lang !== false && $xml_lang === false) {
- $attr['xml:lang'] = $lang;
- } elseif ($xml_lang !== false) {
- $attr['lang'] = $xml_lang;
- }
-
- return $attr;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
deleted file mode 100644
index ea2f30473..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Class for handling width/height length attribute transformations to CSS
- */
-class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
-{
-
- protected $name;
- protected $cssName;
-
- public function __construct($name, $css_name = null) {
- $this->name = $name;
- $this->cssName = $css_name ? $css_name : $name;
- }
-
- public function transform($attr, $config, $context) {
- if (!isset($attr[$this->name])) return $attr;
- $length = $this->confiscateAttr($attr, $this->name);
- if(ctype_digit($length)) $length .= 'px';
- $this->prependCSS($attr, $this->cssName . ":$length;");
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
deleted file mode 100644
index 15315bc73..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated name attribute to ID if necessary
- */
-class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
-{
-
- public function transform($attr, $config, $context) {
- // Abort early if we're using relaxed definition of name
- if ($config->get('HTML.Attr.Name.UseCDATA')) return $attr;
- if (!isset($attr['name'])) return $attr;
- $id = $this->confiscateAttr($attr, 'name');
- if ( isset($attr['id'])) return $attr;
- $attr['id'] = $id;
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
deleted file mode 100644
index a95638c14..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Post-transform that performs validation to the name attribute; if
- * it is present with an equivalent id attribute, it is passed through;
- * otherwise validation is performed.
- */
-class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
-{
-
- public function __construct() {
- $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
- }
-
- public function transform($attr, $config, $context) {
- if (!isset($attr['name'])) return $attr;
- $name = $attr['name'];
- if (isset($attr['id']) && $attr['id'] === $name) return $attr;
- $result = $this->idDef->validate($name, $config, $context);
- if ($result === false) unset($attr['name']);
- else $attr['name'] = $result;
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
deleted file mode 100644
index 4da449981..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
-{
- public $name = "SafeEmbed";
-
- public function transform($attr, $config, $context) {
- $attr['allowscriptaccess'] = 'never';
- $attr['allownetworking'] = 'internal';
- $attr['type'] = 'application/x-shockwave-flash';
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
deleted file mode 100644
index 1ed74898b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Writes default type for all objects. Currently only supports flash.
- */
-class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
-{
- public $name = "SafeObject";
-
- function transform($attr, $config, $context) {
- if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
deleted file mode 100644
index 94e8052a9..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Validates name/value pairs in param tags to be used in safe objects. This
- * will only allow name values it recognizes, and pre-fill certain attributes
- * with required values.
- *
- * @note
- * This class only supports Flash. In the future, Quicktime support
- * may be added.
- *
- * @warning
- * This class expects an injector to add the necessary parameters tags.
- */
-class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
-{
- public $name = "SafeParam";
- private $uri;
-
- public function __construct() {
- $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
- }
-
- public function transform($attr, $config, $context) {
- // If we add support for other objects, we'll need to alter the
- // transforms.
- switch ($attr['name']) {
- // application/x-shockwave-flash
- // Keep this synchronized with Injector/SafeObject.php
- case 'allowScriptAccess':
- $attr['value'] = 'never';
- break;
- case 'allowNetworking':
- $attr['value'] = 'internal';
- break;
- case 'wmode':
- $attr['value'] = 'window';
- break;
- case 'movie':
- $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
- break;
- // add other cases to support other param name/value pairs
- default:
- $attr['name'] = $attr['value'] = null;
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
deleted file mode 100644
index 4499050a2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Implements required attribute stipulation for <script>
- */
-class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
-{
- public function transform($attr, $config, $context) {
- if (!isset($attr['type'])) {
- $attr['type'] = 'text/javascript';
- }
- return $attr;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
deleted file mode 100644
index 81ac3488b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Sets height/width defaults for <textarea>
- */
-class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
-{
-
- public function transform($attr, $config, $context) {
- // Calculated from Firefox
- if (!isset($attr['cols'])) $attr['cols'] = '22';
- if (!isset($attr['rows'])) $attr['rows'] = '3';
- return $attr;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrTypes.php b/extlib/HTMLPurifier/HTMLPurifier/AttrTypes.php
deleted file mode 100644
index fc2ea4e58..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrTypes.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Provides lookup array of attribute types to HTMLPurifier_AttrDef objects
- */
-class HTMLPurifier_AttrTypes
-{
- /**
- * Lookup array of attribute string identifiers to concrete implementations
- */
- protected $info = array();
-
- /**
- * Constructs the info array, supplying default implementations for attribute
- * types.
- */
- public function __construct() {
- // pseudo-types, must be instantiated via shorthand
- $this->info['Enum'] = new HTMLPurifier_AttrDef_Enum();
- $this->info['Bool'] = new HTMLPurifier_AttrDef_HTML_Bool();
-
- $this->info['CDATA'] = new HTMLPurifier_AttrDef_Text();
- $this->info['ID'] = new HTMLPurifier_AttrDef_HTML_ID();
- $this->info['Length'] = new HTMLPurifier_AttrDef_HTML_Length();
- $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
- $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
- $this->info['Pixels'] = new HTMLPurifier_AttrDef_HTML_Pixels();
- $this->info['Text'] = new HTMLPurifier_AttrDef_Text();
- $this->info['URI'] = new HTMLPurifier_AttrDef_URI();
- $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
- $this->info['Color'] = new HTMLPurifier_AttrDef_HTML_Color();
-
- // unimplemented aliases
- $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
- $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
- $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
- $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
-
- // "proprietary" types
- $this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
-
- // number is really a positive integer (one or more digits)
- // FIXME: ^^ not always, see start and value of list items
- $this->info['Number'] = new HTMLPurifier_AttrDef_Integer(false, false, true);
- }
-
- /**
- * Retrieves a type
- * @param $type String type name
- * @return Object AttrDef for type
- */
- public function get($type) {
-
- // determine if there is any extra info tacked on
- if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
- else $string = '';
-
- if (!isset($this->info[$type])) {
- trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
- return;
- }
-
- return $this->info[$type]->make($string);
-
- }
-
- /**
- * Sets a new implementation for a type
- * @param $type String type name
- * @param $impl Object AttrDef for type
- */
- public function set($type, $impl) {
- $this->info[$type] = $impl;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrValidator.php b/extlib/HTMLPurifier/HTMLPurifier/AttrValidator.php
deleted file mode 100644
index 829a0f8f2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/AttrValidator.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * Validates the attributes of a token. Doesn't manage required attributes
- * very well. The only reason we factored this out was because RemoveForeignElements
- * also needed it besides ValidateAttributes.
- */
-class HTMLPurifier_AttrValidator
-{
-
- /**
- * Validates the attributes of a token, returning a modified token
- * that has valid tokens
- * @param $token Reference to token to validate. We require a reference
- * because the operation this class performs on the token are
- * not atomic, so the context CurrentToken to be updated
- * throughout
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- */
- public function validateToken(&$token, &$config, $context) {
-
- $definition = $config->getHTMLDefinition();
- $e =& $context->get('ErrorCollector', true);
-
- // initialize IDAccumulator if necessary
- $ok =& $context->get('IDAccumulator', true);
- if (!$ok) {
- $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
- $context->register('IDAccumulator', $id_accumulator);
- }
-
- // initialize CurrentToken if necessary
- $current_token =& $context->get('CurrentToken', true);
- if (!$current_token) $context->register('CurrentToken', $token);
-
- if (
- !$token instanceof HTMLPurifier_Token_Start &&
- !$token instanceof HTMLPurifier_Token_Empty
- ) return $token;
-
- // create alias to global definition array, see also $defs
- // DEFINITION CALL
- $d_defs = $definition->info_global_attr;
-
- // don't update token until the very end, to ensure an atomic update
- $attr = $token->attr;
-
- // do global transformations (pre)
- // nothing currently utilizes this
- foreach ($definition->info_attr_transform_pre as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
-
- // do local transformations only applicable to this element (pre)
- // ex. <p align="right"> to <p style="text-align:right;">
- foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
-
- // create alias to this element's attribute definition array, see
- // also $d_defs (global attribute definition array)
- // DEFINITION CALL
- $defs = $definition->info[$token->name]->attr;
-
- $attr_key = false;
- $context->register('CurrentAttr', $attr_key);
-
- // iterate through all the attribute keypairs
- // Watch out for name collisions: $key has previously been used
- foreach ($attr as $attr_key => $value) {
-
- // call the definition
- if ( isset($defs[$attr_key]) ) {
- // there is a local definition defined
- if ($defs[$attr_key] === false) {
- // We've explicitly been told not to allow this element.
- // This is usually when there's a global definition
- // that must be overridden.
- // Theoretically speaking, we could have a
- // AttrDef_DenyAll, but this is faster!
- $result = false;
- } else {
- // validate according to the element's definition
- $result = $defs[$attr_key]->validate(
- $value, $config, $context
- );
- }
- } elseif ( isset($d_defs[$attr_key]) ) {
- // there is a global definition defined, validate according
- // to the global definition
- $result = $d_defs[$attr_key]->validate(
- $value, $config, $context
- );
- } else {
- // system never heard of the attribute? DELETE!
- $result = false;
- }
-
- // put the results into effect
- if ($result === false || $result === null) {
- // this is a generic error message that should replaced
- // with more specific ones when possible
- if ($e) $e->send(E_ERROR, 'AttrValidator: Attribute removed');
-
- // remove the attribute
- unset($attr[$attr_key]);
- } elseif (is_string($result)) {
- // generally, if a substitution is happening, there
- // was some sort of implicit correction going on. We'll
- // delegate it to the attribute classes to say exactly what.
-
- // simple substitution
- $attr[$attr_key] = $result;
- } else {
- // nothing happens
- }
-
- // we'd also want slightly more complicated substitution
- // involving an array as the return value,
- // although we're not sure how colliding attributes would
- // resolve (certain ones would be completely overriden,
- // others would prepend themselves).
- }
-
- $context->destroy('CurrentAttr');
-
- // post transforms
-
- // global (error reporting untested)
- foreach ($definition->info_attr_transform_post as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
-
- // local (error reporting untested)
- foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
- $attr = $transform->transform($o = $attr, $config, $context);
- if ($e) {
- if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
- }
- }
-
- $token->attr = $attr;
-
- // destroy CurrentToken if we made it ourselves
- if (!$current_token) $context->destroy('CurrentToken');
-
- }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Bootstrap.php b/extlib/HTMLPurifier/HTMLPurifier/Bootstrap.php
deleted file mode 100644
index 559f61a23..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Bootstrap.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-// constants are slow, so we use as few as possible
-if (!defined('HTMLPURIFIER_PREFIX')) {
- define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
-}
-
-// accomodations for versions earlier than 5.0.2
-// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <aidan@php.net>
-if (!defined('PHP_EOL')) {
- switch (strtoupper(substr(PHP_OS, 0, 3))) {
- case 'WIN':
- define('PHP_EOL', "\r\n");
- break;
- case 'DAR':
- define('PHP_EOL', "\r");
- break;
- default:
- define('PHP_EOL', "\n");
- }
-}
-
-/**
- * Bootstrap class that contains meta-functionality for HTML Purifier such as
- * the autoload function.
- *
- * @note
- * This class may be used without any other files from HTML Purifier.
- */
-class HTMLPurifier_Bootstrap
-{
-
- /**
- * Autoload function for HTML Purifier
- * @param $class Class to load
- */
- public static function autoload($class) {
- $file = HTMLPurifier_Bootstrap::getPath($class);
- if (!$file) return false;
- require HTMLPURIFIER_PREFIX . '/' . $file;
- return true;
- }
-
- /**
- * Returns the path for a specific class.
- */
- public static function getPath($class) {
- if (strncmp('HTMLPurifier', $class, 12) !== 0) return false;
- // Custom implementations
- if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
- $code = str_replace('_', '-', substr($class, 22));
- $file = 'HTMLPurifier/Language/classes/' . $code . '.php';
- } else {
- $file = str_replace('_', '/', $class) . '.php';
- }
- if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) return false;
- return $file;
- }
-
- /**
- * "Pre-registers" our autoloader on the SPL stack.
- */
- public static function registerAutoload() {
- $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
- if ( ($funcs = spl_autoload_functions()) === false ) {
- spl_autoload_register($autoload);
- } elseif (function_exists('spl_autoload_unregister')) {
- $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
- version_compare(PHP_VERSION, '5.1.0', '>=');
- foreach ($funcs as $func) {
- if (is_array($func)) {
- // :TRICKY: There are some compatibility issues and some
- // places where we need to error out
- $reflector = new ReflectionMethod($func[0], $func[1]);
- if (!$reflector->isStatic()) {
- throw new Exception('
- HTML Purifier autoloader registrar is not compatible
- with non-static object methods due to PHP Bug #44144;
- Please do not use HTMLPurifier.autoload.php (or any
- file that includes this file); instead, place the code:
- spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
- after your own autoloaders.
- ');
- }
- // Suprisingly, spl_autoload_register supports the
- // Class::staticMethod callback format, although call_user_func doesn't
- if ($compat) $func = implode('::', $func);
- }
- spl_autoload_unregister($func);
- }
- spl_autoload_register($autoload);
- foreach ($funcs as $func) spl_autoload_register($func);
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/CSSDefinition.php b/extlib/HTMLPurifier/HTMLPurifier/CSSDefinition.php
deleted file mode 100644
index 6a2e6f56d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/CSSDefinition.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-
-/**
- * Defines allowed CSS attributes and what their values are.
- * @see HTMLPurifier_HTMLDefinition
- */
-class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
-{
-
- public $type = 'CSS';
-
- /**
- * Assoc array of attribute name to definition object.
- */
- public $info = array();
-
- /**
- * Constructs the info array. The meat of this class.
- */
- protected function doSetup($config) {
-
- $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
- array('left', 'right', 'center', 'justify'), false);
-
- $border_style =
- $this->info['border-bottom-style'] =
- $this->info['border-right-style'] =
- $this->info['border-left-style'] =
- $this->info['border-top-style'] = new HTMLPurifier_AttrDef_Enum(
- array('none', 'hidden', 'dotted', 'dashed', 'solid', 'double',
- 'groove', 'ridge', 'inset', 'outset'), false);
-
- $this->info['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);
-
- $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
- array('none', 'left', 'right', 'both'), false);
- $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
- array('none', 'left', 'right'), false);
- $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
- array('normal', 'italic', 'oblique'), false);
- $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
- array('normal', 'small-caps'), false);
-
- $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
- array(
- new HTMLPurifier_AttrDef_Enum(array('none')),
- new HTMLPurifier_AttrDef_CSS_URI()
- )
- );
-
- $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
- array('inside', 'outside'), false);
- $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
- array('disc', 'circle', 'square', 'decimal', 'lower-roman',
- 'upper-roman', 'lower-alpha', 'upper-alpha', 'none'), false);
- $this->info['list-style-image'] = $uri_or_none;
-
- $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);
-
- $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
- array('capitalize', 'uppercase', 'lowercase', 'none'), false);
- $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
- $this->info['background-image'] = $uri_or_none;
- $this->info['background-repeat'] = new HTMLPurifier_AttrDef_Enum(
- array('repeat', 'repeat-x', 'repeat-y', 'no-repeat')
- );
- $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
- array('scroll', 'fixed')
- );
- $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
-
- $border_color =
- $this->info['border-top-color'] =
- $this->info['border-bottom-color'] =
- $this->info['border-left-color'] =
- $this->info['border-right-color'] =
- $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('transparent')),
- new HTMLPurifier_AttrDef_CSS_Color()
- ));
-
- $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);
-
- $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);
-
- $border_width =
- $this->info['border-top-width'] =
- $this->info['border-bottom-width'] =
- $this->info['border-left-width'] =
- $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
- new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
- ));
-
- $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);
-
- $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('normal')),
- new HTMLPurifier_AttrDef_CSS_Length()
- ));
-
- $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('normal')),
- new HTMLPurifier_AttrDef_CSS_Length()
- ));
-
- $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('xx-small', 'x-small',
- 'small', 'medium', 'large', 'x-large', 'xx-large',
- 'larger', 'smaller')),
- new HTMLPurifier_AttrDef_CSS_Percentage(),
- new HTMLPurifier_AttrDef_CSS_Length()
- ));
-
- $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('normal')),
- new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
- new HTMLPurifier_AttrDef_CSS_Length('0'),
- new HTMLPurifier_AttrDef_CSS_Percentage(true)
- ));
-
- $margin =
- $this->info['margin-top'] =
- $this->info['margin-bottom'] =
- $this->info['margin-left'] =
- $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage(),
- new HTMLPurifier_AttrDef_Enum(array('auto'))
- ));
-
- $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);
-
- // non-negative
- $padding =
- $this->info['padding-top'] =
- $this->info['padding-bottom'] =
- $this->info['padding-left'] =
- $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_CSS_Length('0'),
- new HTMLPurifier_AttrDef_CSS_Percentage(true)
- ));
-
- $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);
-
- $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage()
- ));
-
- $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_CSS_Length('0'),
- new HTMLPurifier_AttrDef_CSS_Percentage(true),
- new HTMLPurifier_AttrDef_Enum(array('auto'))
- ));
- $max = $config->get('CSS.MaxImgLength');
-
- $this->info['width'] =
- $this->info['height'] =
- $max === null ?
- $trusted_wh :
- new HTMLPurifier_AttrDef_Switch('img',
- // For img tags:
- new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_CSS_Length('0', $max),
- new HTMLPurifier_AttrDef_Enum(array('auto'))
- )),
- // For everyone else:
- $trusted_wh
- );
-
- $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
-
- $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
-
- // this could use specialized code
- $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
- array('normal', 'bold', 'bolder', 'lighter', '100', '200', '300',
- '400', '500', '600', '700', '800', '900'), false);
-
- // MUST be called after other font properties, as it references
- // a CSSDefinition object
- $this->info['font'] = new HTMLPurifier_AttrDef_CSS_Font($config);
-
- // same here
- $this->info['border'] =
- $this->info['border-bottom'] =
- $this->info['border-top'] =
- $this->info['border-left'] =
- $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);
-
- $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(array(
- 'collapse', 'separate'));
-
- $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(array(
- 'top', 'bottom'));
-
- $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(array(
- 'auto', 'fixed'));
-
- $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
- new HTMLPurifier_AttrDef_Enum(array('baseline', 'sub', 'super',
- 'top', 'text-top', 'middle', 'bottom', 'text-bottom')),
- new HTMLPurifier_AttrDef_CSS_Length(),
- new HTMLPurifier_AttrDef_CSS_Percentage()
- ));
-
- $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);
-
- // partial support
- $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(array('nowrap'));
-
- if ($config->get('CSS.Proprietary')) {
- $this->doSetupProprietary($config);
- }
-
- if ($config->get('CSS.AllowTricky')) {
- $this->doSetupTricky($config);
- }
-
- $allow_important = $config->get('CSS.AllowImportant');
- // wrap all attr-defs with decorator that handles !important
- foreach ($this->info as $k => $v) {
- $this->info[$k] = new HTMLPurifier_AttrDef_CSS_ImportantDecorator($v, $allow_important);
- }
-
- $this->setupConfigStuff($config);
- }
-
- protected function doSetupProprietary($config) {
- // Internet Explorer only scrollbar colors
- $this->info['scrollbar-arrow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-base-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-darkshadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-face-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-highlight-color'] = new HTMLPurifier_AttrDef_CSS_Color();
- $this->info['scrollbar-shadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
- // technically not proprietary, but CSS3, and no one supports it
- $this->info['opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
- $this->info['-moz-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
- $this->info['-khtml-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-
- // only opacity, for now
- $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();
-
- }
-
- protected function doSetupTricky($config) {
- $this->info['display'] = new HTMLPurifier_AttrDef_Enum(array(
- 'inline', 'block', 'list-item', 'run-in', 'compact',
- 'marker', 'table', 'inline-table', 'table-row-group',
- 'table-header-group', 'table-footer-group', 'table-row',
- 'table-column-group', 'table-column', 'table-cell', 'table-caption', 'none'
- ));
- $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(array(
- 'visible', 'hidden', 'collapse'
- ));
- $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
- }
-
-
- /**
- * Performs extra config-based processing. Based off of
- * HTMLPurifier_HTMLDefinition.
- * @todo Refactor duplicate elements into common class (probably using
- * composition, not inheritance).
- */
- protected function setupConfigStuff($config) {
-
- // setup allowed elements
- $support = "(for information on implementing this, see the ".
- "support forums) ";
- $allowed_attributes = $config->get('CSS.AllowedProperties');
- if ($allowed_attributes !== null) {
- foreach ($this->info as $name => $d) {
- if(!isset($allowed_attributes[$name])) unset($this->info[$name]);
- unset($allowed_attributes[$name]);
- }
- // emit errors
- foreach ($allowed_attributes as $name => $d) {
- // :TODO: Is this htmlspecialchars() call really necessary?
- $name = htmlspecialchars($name);
- trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
- }
- }
-
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef.php
deleted file mode 100644
index c5d5216da..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Defines allowed child nodes and validates tokens against it.
- */
-abstract class HTMLPurifier_ChildDef
-{
- /**
- * Type of child definition, usually right-most part of class name lowercase.
- * Used occasionally in terms of context.
- */
- public $type;
-
- /**
- * Bool that indicates whether or not an empty array of children is okay
- *
- * This is necessary for redundant checking when changes affecting
- * a child node may cause a parent node to now be disallowed.
- */
- public $allow_empty;
-
- /**
- * Lookup array of all elements that this definition could possibly allow
- */
- public $elements = array();
-
- /**
- * Get lookup of tag names that should not close this element automatically.
- * All other elements will do so.
- */
- public function getAllowedElements($config) {
- return $this->elements;
- }
-
- /**
- * Validates nodes according to definition and returns modification.
- *
- * @param $tokens_of_children Array of HTMLPurifier_Token
- * @param $config HTMLPurifier_Config object
- * @param $context HTMLPurifier_Context object
- * @return bool true to leave nodes as is
- * @return bool false to remove parent node
- * @return array of replacement child tokens
- */
- abstract public function validateChildren($tokens_of_children, $config, $context);
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
deleted file mode 100644
index 15c364ee3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Definition that uses different definitions depending on context.
- *
- * The del and ins tags are notable because they allow different types of
- * elements depending on whether or not they're in a block or inline context.
- * Chameleon allows this behavior to happen by using two different
- * definitions depending on context. While this somewhat generalized,
- * it is specifically intended for those two tags.
- */
-class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
-{
-
- /**
- * Instance of the definition object to use when inline. Usually stricter.
- */
- public $inline;
-
- /**
- * Instance of the definition object to use when block.
- */
- public $block;
-
- public $type = 'chameleon';
-
- /**
- * @param $inline List of elements to allow when inline.
- * @param $block List of elements to allow when block.
- */
- public function __construct($inline, $block) {
- $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
- $this->block = new HTMLPurifier_ChildDef_Optional($block);
- $this->elements = $this->block->elements;
- }
-
- public function validateChildren($tokens_of_children, $config, $context) {
- if ($context->get('IsInline') === false) {
- return $this->block->validateChildren(
- $tokens_of_children, $config, $context);
- } else {
- return $this->inline->validateChildren(
- $tokens_of_children, $config, $context);
- }
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
deleted file mode 100644
index b68047b4b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Custom validation class, accepts DTD child definitions
- *
- * @warning Currently this class is an all or nothing proposition, that is,
- * it will only give a bool return value.
- */
-class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
-{
- public $type = 'custom';
- public $allow_empty = false;
- /**
- * Allowed child pattern as defined by the DTD
- */
- public $dtd_regex;
- /**
- * PCRE regex derived from $dtd_regex
- * @private
- */
- private $_pcre_regex;
- /**
- * @param $dtd_regex Allowed child pattern from the DTD
- */
- public function __construct($dtd_regex) {
- $this->dtd_regex = $dtd_regex;
- $this->_compileRegex();
- }
- /**
- * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
- */
- protected function _compileRegex() {
- $raw = str_replace(' ', '', $this->dtd_regex);
- if ($raw{0} != '(') {
- $raw = "($raw)";
- }
- $el = '[#a-zA-Z0-9_.-]+';
- $reg = $raw;
-
- // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
- // DOING! Seriously: if there's problems, please report them.
-
- // collect all elements into the $elements array
- preg_match_all("/$el/", $reg, $matches);
- foreach ($matches[0] as $match) {
- $this->elements[$match] = true;
- }
-
- // setup all elements as parentheticals with leading commas
- $reg = preg_replace("/$el/", '(,\\0)', $reg);
-
- // remove commas when they were not solicited
- $reg = preg_replace("/([^,(|]\(+),/", '\\1', $reg);
-
- // remove all non-paranthetical commas: they are handled by first regex
- $reg = preg_replace("/,\(/", '(', $reg);
-
- $this->_pcre_regex = $reg;
- }
- public function validateChildren($tokens_of_children, $config, $context) {
- $list_of_children = '';
- $nesting = 0; // depth into the nest
- foreach ($tokens_of_children as $token) {
- if (!empty($token->is_whitespace)) continue;
-
- $is_child = ($nesting == 0); // direct
-
- if ($token instanceof HTMLPurifier_Token_Start) {
- $nesting++;
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- $nesting--;
- }
-
- if ($is_child) {
- $list_of_children .= $token->name . ',';
- }
- }
- // add leading comma to deal with stray comma declarations
- $list_of_children = ',' . rtrim($list_of_children, ',');
- $okay =
- preg_match(
- '/^,?'.$this->_pcre_regex.'$/',
- $list_of_children
- );
-
- return (bool) $okay;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
deleted file mode 100644
index 13171f665..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Definition that disallows all elements.
- * @warning validateChildren() in this class is actually never called, because
- * empty elements are corrected in HTMLPurifier_Strategy_MakeWellFormed
- * before child definitions are parsed in earnest by
- * HTMLPurifier_Strategy_FixNesting.
- */
-class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
-{
- public $allow_empty = true;
- public $type = 'empty';
- public function __construct() {}
- public function validateChildren($tokens_of_children, $config, $context) {
- return array();
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
deleted file mode 100644
index 32bcb9898..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Definition that allows a set of elements, and allows no children.
- * @note This is a hack to reuse code from HTMLPurifier_ChildDef_Required,
- * really, one shouldn't inherit from the other. Only altered behavior
- * is to overload a returned false with an array. Thus, it will never
- * return false.
- */
-class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
-{
- public $allow_empty = true;
- public $type = 'optional';
- public function validateChildren($tokens_of_children, $config, $context) {
- $result = parent::validateChildren($tokens_of_children, $config, $context);
- // we assume that $tokens_of_children is not modified
- if ($result === false) {
- if (empty($tokens_of_children)) return true;
- elseif ($this->whitespace) return $tokens_of_children;
- else return array();
- }
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
deleted file mode 100644
index 4889f249b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * Definition that allows a set of elements, but disallows empty children.
- */
-class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
-{
- /**
- * Lookup table of allowed elements.
- * @public
- */
- public $elements = array();
- /**
- * Whether or not the last passed node was all whitespace.
- */
- protected $whitespace = false;
- /**
- * @param $elements List of allowed element names (lowercase).
- */
- public function __construct($elements) {
- if (is_string($elements)) {
- $elements = str_replace(' ', '', $elements);
- $elements = explode('|', $elements);
- }
- $keys = array_keys($elements);
- if ($keys == array_keys($keys)) {
- $elements = array_flip($elements);
- foreach ($elements as $i => $x) {
- $elements[$i] = true;
- if (empty($i)) unset($elements[$i]); // remove blank
- }
- }
- $this->elements = $elements;
- }
- public $allow_empty = false;
- public $type = 'required';
- public function validateChildren($tokens_of_children, $config, $context) {
- // Flag for subclasses
- $this->whitespace = false;
-
- // if there are no tokens, delete parent node
- if (empty($tokens_of_children)) return false;
-
- // the new set of children
- $result = array();
-
- // current depth into the nest
- $nesting = 0;
-
- // whether or not we're deleting a node
- $is_deleting = false;
-
- // whether or not parsed character data is allowed
- // this controls whether or not we silently drop a tag
- // or generate escaped HTML from it
- $pcdata_allowed = isset($this->elements['#PCDATA']);
-
- // a little sanity check to make sure it's not ALL whitespace
- $all_whitespace = true;
-
- // some configuration
- $escape_invalid_children = $config->get('Core.EscapeInvalidChildren');
-
- // generator
- $gen = new HTMLPurifier_Generator($config, $context);
-
- foreach ($tokens_of_children as $token) {
- if (!empty($token->is_whitespace)) {
- $result[] = $token;
- continue;
- }
- $all_whitespace = false; // phew, we're not talking about whitespace
-
- $is_child = ($nesting == 0);
-
- if ($token instanceof HTMLPurifier_Token_Start) {
- $nesting++;
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- $nesting--;
- }
-
- if ($is_child) {
- $is_deleting = false;
- if (!isset($this->elements[$token->name])) {
- $is_deleting = true;
- if ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text) {
- $result[] = $token;
- } elseif ($pcdata_allowed && $escape_invalid_children) {
- $result[] = new HTMLPurifier_Token_Text(
- $gen->generateFromToken($token)
- );
- }
- continue;
- }
- }
- if (!$is_deleting || ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text)) {
- $result[] = $token;
- } elseif ($pcdata_allowed && $escape_invalid_children) {
- $result[] =
- new HTMLPurifier_Token_Text(
- $gen->generateFromToken($token)
- );
- } else {
- // drop silently
- }
- }
- if (empty($result)) return false;
- if ($all_whitespace) {
- $this->whitespace = true;
- return false;
- }
- if ($tokens_of_children == $result) return true;
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
deleted file mode 100644
index dfae8a6e5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Takes the contents of blockquote when in strict and reformats for validation.
- */
-class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
-{
- protected $real_elements;
- protected $fake_elements;
- public $allow_empty = true;
- public $type = 'strictblockquote';
- protected $init = false;
-
- /**
- * @note We don't want MakeWellFormed to auto-close inline elements since
- * they might be allowed.
- */
- public function getAllowedElements($config) {
- $this->init($config);
- return $this->fake_elements;
- }
-
- public function validateChildren($tokens_of_children, $config, $context) {
-
- $this->init($config);
-
- // trick the parent class into thinking it allows more
- $this->elements = $this->fake_elements;
- $result = parent::validateChildren($tokens_of_children, $config, $context);
- $this->elements = $this->real_elements;
-
- if ($result === false) return array();
- if ($result === true) $result = $tokens_of_children;
-
- $def = $config->getHTMLDefinition();
- $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
- $block_wrap_end = new HTMLPurifier_Token_End( $def->info_block_wrapper);
- $is_inline = false;
- $depth = 0;
- $ret = array();
-
- // assuming that there are no comment tokens
- foreach ($result as $i => $token) {
- $token = $result[$i];
- // ifs are nested for readability
- if (!$is_inline) {
- if (!$depth) {
- if (
- ($token instanceof HTMLPurifier_Token_Text && !$token->is_whitespace) ||
- (!$token instanceof HTMLPurifier_Token_Text && !isset($this->elements[$token->name]))
- ) {
- $is_inline = true;
- $ret[] = $block_wrap_start;
- }
- }
- } else {
- if (!$depth) {
- // starting tokens have been inline text / empty
- if ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) {
- if (isset($this->elements[$token->name])) {
- // ended
- $ret[] = $block_wrap_end;
- $is_inline = false;
- }
- }
- }
- }
- $ret[] = $token;
- if ($token instanceof HTMLPurifier_Token_Start) $depth++;
- if ($token instanceof HTMLPurifier_Token_End) $depth--;
- }
- if ($is_inline) $ret[] = $block_wrap_end;
- return $ret;
- }
-
- private function init($config) {
- if (!$this->init) {
- $def = $config->getHTMLDefinition();
- // allow all inline elements
- $this->real_elements = $this->elements;
- $this->fake_elements = $def->info_content_sets['Flow'];
- $this->fake_elements['#PCDATA'] = true;
- $this->init = true;
- }
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php b/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
deleted file mode 100644
index 34f0227dd..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Definition for tables
- */
-class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
-{
- public $allow_empty = false;
- public $type = 'table';
- public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
- 'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
- public function __construct() {}
- public function validateChildren($tokens_of_children, $config, $context) {
- if (empty($tokens_of_children)) return false;
-
- // this ensures that the loop gets run one last time before closing
- // up. It's a little bit of a hack, but it works! Just make sure you
- // get rid of the token later.
- $tokens_of_children[] = false;
-
- // only one of these elements is allowed in a table
- $caption = false;
- $thead = false;
- $tfoot = false;
-
- // as many of these as you want
- $cols = array();
- $content = array();
-
- $nesting = 0; // current depth so we can determine nodes
- $is_collecting = false; // are we globbing together tokens to package
- // into one of the collectors?
- $collection = array(); // collected nodes
- $tag_index = 0; // the first node might be whitespace,
- // so this tells us where the start tag is
-
- foreach ($tokens_of_children as $token) {
- $is_child = ($nesting == 0);
-
- if ($token === false) {
- // terminating sequence started
- } elseif ($token instanceof HTMLPurifier_Token_Start) {
- $nesting++;
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- $nesting--;
- }
-
- // handle node collection
- if ($is_collecting) {
- if ($is_child) {
- // okay, let's stash the tokens away
- // first token tells us the type of the collection
- switch ($collection[$tag_index]->name) {
- case 'tr':
- case 'tbody':
- $content[] = $collection;
- break;
- case 'caption':
- if ($caption !== false) break;
- $caption = $collection;
- break;
- case 'thead':
- case 'tfoot':
- // access the appropriate variable, $thead or $tfoot
- $var = $collection[$tag_index]->name;
- if ($$var === false) {
- $$var = $collection;
- } else {
- // transmutate the first and less entries into
- // tbody tags, and then put into content
- $collection[$tag_index]->name = 'tbody';
- $collection[count($collection)-1]->name = 'tbody';
- $content[] = $collection;
- }
- break;
- case 'colgroup':
- $cols[] = $collection;
- break;
- }
- $collection = array();
- $is_collecting = false;
- $tag_index = 0;
- } else {
- // add the node to the collection
- $collection[] = $token;
- }
- }
-
- // terminate
- if ($token === false) break;
-
- if ($is_child) {
- // determine what we're dealing with
- if ($token->name == 'col') {
- // the only empty tag in the possie, we can handle it
- // immediately
- $cols[] = array_merge($collection, array($token));
- $collection = array();
- $tag_index = 0;
- continue;
- }
- switch($token->name) {
- case 'caption':
- case 'colgroup':
- case 'thead':
- case 'tfoot':
- case 'tbody':
- case 'tr':
- $is_collecting = true;
- $collection[] = $token;
- continue;
- default:
- if (!empty($token->is_whitespace)) {
- $collection[] = $token;
- $tag_index++;
- }
- continue;
- }
- }
- }
-
- if (empty($content)) return false;
-
- $ret = array();
- if ($caption !== false) $ret = array_merge($ret, $caption);
- if ($cols !== false) foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
- if ($thead !== false) $ret = array_merge($ret, $thead);
- if ($tfoot !== false) $ret = array_merge($ret, $tfoot);
- foreach ($content as $token_array) $ret = array_merge($ret, $token_array);
- if (!empty($collection) && $is_collecting == false){
- // grab the trailing space
- $ret = array_merge($ret, $collection);
- }
-
- array_pop($tokens_of_children); // remove phantom token
-
- return ($ret === $tokens_of_children) ? true : $ret;
-
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Config.php b/extlib/HTMLPurifier/HTMLPurifier/Config.php
deleted file mode 100644
index a01706043..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Config.php
+++ /dev/null
@@ -1,580 +0,0 @@
-<?php
-
-/**
- * Configuration object that triggers customizable behavior.
- *
- * @warning This class is strongly defined: that means that the class
- * will fail if an undefined directive is retrieved or set.
- *
- * @note Many classes that could (although many times don't) use the
- * configuration object make it a mandatory parameter. This is
- * because a configuration object should always be forwarded,
- * otherwise, you run the risk of missing a parameter and then
- * being stumped when a configuration directive doesn't work.
- *
- * @todo Reconsider some of the public member variables
- */
-class HTMLPurifier_Config
-{
-
- /**
- * HTML Purifier's version
- */
- public $version = '4.0.0';
-
- /**
- * Bool indicator whether or not to automatically finalize
- * the object if a read operation is done
- */
- public $autoFinalize = true;
-
- // protected member variables
-
- /**
- * Namespace indexed array of serials for specific namespaces (see
- * getSerial() for more info).
- */
- protected $serials = array();
-
- /**
- * Serial for entire configuration object
- */
- protected $serial;
-
- /**
- * Parser for variables
- */
- protected $parser;
-
- /**
- * Reference HTMLPurifier_ConfigSchema for value checking
- * @note This is public for introspective purposes. Please don't
- * abuse!
- */
- public $def;
-
- /**
- * Indexed array of definitions
- */
- protected $definitions;
-
- /**
- * Bool indicator whether or not config is finalized
- */
- protected $finalized = false;
-
- /**
- * Property list containing configuration directives.
- */
- protected $plist;
-
- /**
- * Whether or not a set is taking place due to an
- * alias lookup.
- */
- private $aliasMode;
-
- /**
- * Set to false if you do not want line and file numbers in errors
- * (useful when unit testing)
- */
- public $chatty = true;
-
- /**
- * Current lock; only gets to this namespace are allowed.
- */
- private $lock;
-
- /**
- * @param $definition HTMLPurifier_ConfigSchema that defines what directives
- * are allowed.
- */
- public function __construct($definition, $parent = null) {
- $parent = $parent ? $parent : $definition->defaultPlist;
- $this->plist = new HTMLPurifier_PropertyList($parent);
- $this->def = $definition; // keep a copy around for checking
- $this->parser = new HTMLPurifier_VarParser_Flexible();
- }
-
- /**
- * Convenience constructor that creates a config object based on a mixed var
- * @param mixed $config Variable that defines the state of the config
- * object. Can be: a HTMLPurifier_Config() object,
- * an array of directives based on loadArray(),
- * or a string filename of an ini file.
- * @param HTMLPurifier_ConfigSchema Schema object
- * @return Configured HTMLPurifier_Config object
- */
- public static function create($config, $schema = null) {
- if ($config instanceof HTMLPurifier_Config) {
- // pass-through
- return $config;
- }
- if (!$schema) {
- $ret = HTMLPurifier_Config::createDefault();
- } else {
- $ret = new HTMLPurifier_Config($schema);
- }
- if (is_string($config)) $ret->loadIni($config);
- elseif (is_array($config)) $ret->loadArray($config);
- return $ret;
- }
-
- /**
- * Creates a new config object that inherits from a previous one.
- * @param HTMLPurifier_Config $config Configuration object to inherit
- * from.
- * @return HTMLPurifier_Config object with $config as its parent.
- */
- public static function inherit(HTMLPurifier_Config $config) {
- return new HTMLPurifier_Config($config->def, $config->plist);
- }
-
- /**
- * Convenience constructor that creates a default configuration object.
- * @return Default HTMLPurifier_Config object.
- */
- public static function createDefault() {
- $definition = HTMLPurifier_ConfigSchema::instance();
- $config = new HTMLPurifier_Config($definition);
- return $config;
- }
-
- /**
- * Retreives a value from the configuration.
- * @param $key String key
- */
- public function get($key, $a = null) {
- if ($a !== null) {
- $this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
- $key = "$key.$a";
- }
- if (!$this->finalized) $this->autoFinalize();
- if (!isset($this->def->info[$key])) {
- // can't add % due to SimpleTest bug
- $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key),
- E_USER_WARNING);
- return;
- }
- if (isset($this->def->info[$key]->isAlias)) {
- $d = $this->def->info[$key];
- $this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
- E_USER_ERROR);
- return;
- }
- if ($this->lock) {
- list($ns) = explode('.', $key);
- if ($ns !== $this->lock) {
- $this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
- return;
- }
- }
- return $this->plist->get($key);
- }
-
- /**
- * Retreives an array of directives to values from a given namespace
- * @param $namespace String namespace
- */
- public function getBatch($namespace) {
- if (!$this->finalized) $this->autoFinalize();
- $full = $this->getAll();
- if (!isset($full[$namespace])) {
- $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace),
- E_USER_WARNING);
- return;
- }
- return $full[$namespace];
- }
-
- /**
- * Returns a md5 signature of a segment of the configuration object
- * that uniquely identifies that particular configuration
- * @note Revision is handled specially and is removed from the batch
- * before processing!
- * @param $namespace Namespace to get serial for
- */
- public function getBatchSerial($namespace) {
- if (empty($this->serials[$namespace])) {
- $batch = $this->getBatch($namespace);
- unset($batch['DefinitionRev']);
- $this->serials[$namespace] = md5(serialize($batch));
- }
- return $this->serials[$namespace];
- }
-
- /**
- * Returns a md5 signature for the entire configuration object
- * that uniquely identifies that particular configuration
- */
- public function getSerial() {
- if (empty($this->serial)) {
- $this->serial = md5(serialize($this->getAll()));
- }
- return $this->serial;
- }
-
- /**
- * Retrieves all directives, organized by namespace
- * @warning This is a pretty inefficient function, avoid if you can
- */
- public function getAll() {
- if (!$this->finalized) $this->autoFinalize();
- $ret = array();
- foreach ($this->plist->squash() as $name => $value) {
- list($ns, $key) = explode('.', $name, 2);
- $ret[$ns][$key] = $value;
- }
- return $ret;
- }
-
- /**
- * Sets a value to configuration.
- * @param $key String key
- * @param $value Mixed value
- */
- public function set($key, $value, $a = null) {
- if (strpos($key, '.') === false) {
- $namespace = $key;
- $directive = $value;
- $value = $a;
- $key = "$key.$directive";
- $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
- } else {
- list($namespace) = explode('.', $key);
- }
- if ($this->isFinalized('Cannot set directive after finalization')) return;
- if (!isset($this->def->info[$key])) {
- $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key) . ' to value',
- E_USER_WARNING);
- return;
- }
- $def = $this->def->info[$key];
-
- if (isset($def->isAlias)) {
- if ($this->aliasMode) {
- $this->triggerError('Double-aliases not allowed, please fix '.
- 'ConfigSchema bug with' . $key, E_USER_ERROR);
- return;
- }
- $this->aliasMode = true;
- $this->set($def->key, $value);
- $this->aliasMode = false;
- $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
- return;
- }
-
- // Raw type might be negative when using the fully optimized form
- // of stdclass, which indicates allow_null == true
- $rtype = is_int($def) ? $def : $def->type;
- if ($rtype < 0) {
- $type = -$rtype;
- $allow_null = true;
- } else {
- $type = $rtype;
- $allow_null = isset($def->allow_null);
- }
-
- try {
- $value = $this->parser->parse($value, $type, $allow_null);
- } catch (HTMLPurifier_VarParserException $e) {
- $this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
- return;
- }
- if (is_string($value) && is_object($def)) {
- // resolve value alias if defined
- if (isset($def->aliases[$value])) {
- $value = $def->aliases[$value];
- }
- // check to see if the value is allowed
- if (isset($def->allowed) && !isset($def->allowed[$value])) {
- $this->triggerError('Value not supported, valid values are: ' .
- $this->_listify($def->allowed), E_USER_WARNING);
- return;
- }
- }
- $this->plist->set($key, $value);
-
- // reset definitions if the directives they depend on changed
- // this is a very costly process, so it's discouraged
- // with finalization
- if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
- $this->definitions[$namespace] = null;
- }
-
- $this->serials[$namespace] = false;
- }
-
- /**
- * Convenience function for error reporting
- */
- private function _listify($lookup) {
- $list = array();
- foreach ($lookup as $name => $b) $list[] = $name;
- return implode(', ', $list);
- }
-
- /**
- * Retrieves object reference to the HTML definition.
- * @param $raw Return a copy that has not been setup yet. Must be
- * called before it's been setup, otherwise won't work.
- */
- public function getHTMLDefinition($raw = false) {
- return $this->getDefinition('HTML', $raw);
- }
-
- /**
- * Retrieves object reference to the CSS definition
- * @param $raw Return a copy that has not been setup yet. Must be
- * called before it's been setup, otherwise won't work.
- */
- public function getCSSDefinition($raw = false) {
- return $this->getDefinition('CSS', $raw);
- }
-
- /**
- * Retrieves a definition
- * @param $type Type of definition: HTML, CSS, etc
- * @param $raw Whether or not definition should be returned raw
- */
- public function getDefinition($type, $raw = false) {
- if (!$this->finalized) $this->autoFinalize();
- // temporarily suspend locks, so we can handle recursive definition calls
- $lock = $this->lock;
- $this->lock = null;
- $factory = HTMLPurifier_DefinitionCacheFactory::instance();
- $cache = $factory->create($type, $this);
- $this->lock = $lock;
- if (!$raw) {
- // see if we can quickly supply a definition
- if (!empty($this->definitions[$type])) {
- if (!$this->definitions[$type]->setup) {
- $this->definitions[$type]->setup($this);
- $cache->set($this->definitions[$type], $this);
- }
- return $this->definitions[$type];
- }
- // memory check missed, try cache
- $this->definitions[$type] = $cache->get($this);
- if ($this->definitions[$type]) {
- // definition in cache, return it
- return $this->definitions[$type];
- }
- } elseif (
- !empty($this->definitions[$type]) &&
- !$this->definitions[$type]->setup
- ) {
- // raw requested, raw in memory, quick return
- return $this->definitions[$type];
- }
- // quick checks failed, let's create the object
- if ($type == 'HTML') {
- $this->definitions[$type] = new HTMLPurifier_HTMLDefinition();
- } elseif ($type == 'CSS') {
- $this->definitions[$type] = new HTMLPurifier_CSSDefinition();
- } elseif ($type == 'URI') {
- $this->definitions[$type] = new HTMLPurifier_URIDefinition();
- } else {
- throw new HTMLPurifier_Exception("Definition of $type type not supported");
- }
- // quick abort if raw
- if ($raw) {
- if (is_null($this->get($type . '.DefinitionID'))) {
- // fatally error out if definition ID not set
- throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
- }
- return $this->definitions[$type];
- }
- // set it up
- $this->lock = $type;
- $this->definitions[$type]->setup($this);
- $this->lock = null;
- // save in cache
- $cache->set($this->definitions[$type], $this);
- return $this->definitions[$type];
- }
-
- /**
- * Loads configuration values from an array with the following structure:
- * Namespace.Directive => Value
- * @param $config_array Configuration associative array
- */
- public function loadArray($config_array) {
- if ($this->isFinalized('Cannot load directives after finalization')) return;
- foreach ($config_array as $key => $value) {
- $key = str_replace('_', '.', $key);
- if (strpos($key, '.') !== false) {
- $this->set($key, $value);
- } else {
- $namespace = $key;
- $namespace_values = $value;
- foreach ($namespace_values as $directive => $value) {
- $this->set($namespace .'.'. $directive, $value);
- }
- }
- }
- }
-
- /**
- * Returns a list of array(namespace, directive) for all directives
- * that are allowed in a web-form context as per an allowed
- * namespaces/directives list.
- * @param $allowed List of allowed namespaces/directives
- */
- public static function getAllowedDirectivesForForm($allowed, $schema = null) {
- if (!$schema) {
- $schema = HTMLPurifier_ConfigSchema::instance();
- }
- if ($allowed !== true) {
- if (is_string($allowed)) $allowed = array($allowed);
- $allowed_ns = array();
- $allowed_directives = array();
- $blacklisted_directives = array();
- foreach ($allowed as $ns_or_directive) {
- if (strpos($ns_or_directive, '.') !== false) {
- // directive
- if ($ns_or_directive[0] == '-') {
- $blacklisted_directives[substr($ns_or_directive, 1)] = true;
- } else {
- $allowed_directives[$ns_or_directive] = true;
- }
- } else {
- // namespace
- $allowed_ns[$ns_or_directive] = true;
- }
- }
- }
- $ret = array();
- foreach ($schema->info as $key => $def) {
- list($ns, $directive) = explode('.', $key, 2);
- if ($allowed !== true) {
- if (isset($blacklisted_directives["$ns.$directive"])) continue;
- if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
- }
- if (isset($def->isAlias)) continue;
- if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
- $ret[] = array($ns, $directive);
- }
- return $ret;
- }
-
- /**
- * Loads configuration values from $_GET/$_POST that were posted
- * via ConfigForm
- * @param $array $_GET or $_POST array to import
- * @param $index Index/name that the config variables are in
- * @param $allowed List of allowed namespaces/directives
- * @param $mq_fix Boolean whether or not to enable magic quotes fix
- * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
- */
- public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
- $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
- $config = HTMLPurifier_Config::create($ret, $schema);
- return $config;
- }
-
- /**
- * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
- * @note Same parameters as loadArrayFromForm
- */
- public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
- $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
- $this->loadArray($ret);
- }
-
- /**
- * Prepares an array from a form into something usable for the more
- * strict parts of HTMLPurifier_Config
- */
- public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
- if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
- $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
-
- $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
- $ret = array();
- foreach ($allowed as $key) {
- list($ns, $directive) = $key;
- $skey = "$ns.$directive";
- if (!empty($array["Null_$skey"])) {
- $ret[$ns][$directive] = null;
- continue;
- }
- if (!isset($array[$skey])) continue;
- $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
- $ret[$ns][$directive] = $value;
- }
- return $ret;
- }
-
- /**
- * Loads configuration values from an ini file
- * @param $filename Name of ini file
- */
- public function loadIni($filename) {
- if ($this->isFinalized('Cannot load directives after finalization')) return;
- $array = parse_ini_file($filename, true);
- $this->loadArray($array);
- }
-
- /**
- * Checks whether or not the configuration object is finalized.
- * @param $error String error message, or false for no error
- */
- public function isFinalized($error = false) {
- if ($this->finalized && $error) {
- $this->triggerError($error, E_USER_ERROR);
- }
- return $this->finalized;
- }
-
- /**
- * Finalizes configuration only if auto finalize is on and not
- * already finalized
- */
- public function autoFinalize() {
- if ($this->autoFinalize) {
- $this->finalize();
- } else {
- $this->plist->squash(true);
- }
- }
-
- /**
- * Finalizes a configuration object, prohibiting further change
- */
- public function finalize() {
- $this->finalized = true;
- unset($this->parser);
- }
-
- /**
- * Produces a nicely formatted error message by supplying the
- * stack frame information from two levels up and OUTSIDE of
- * HTMLPurifier_Config.
- */
- protected function triggerError($msg, $no) {
- // determine previous stack frame
- $backtrace = debug_backtrace();
- if ($this->chatty && isset($backtrace[1])) {
- $frame = $backtrace[1];
- $extra = " on line {$frame['line']} in file {$frame['file']}";
- } else {
- $extra = '';
- }
- trigger_error($msg . $extra, $no);
- }
-
- /**
- * Returns a serialized form of the configuration object that can
- * be reconstituted.
- */
- public function serialize() {
- $this->getDefinition('HTML');
- $this->getDefinition('CSS');
- $this->getDefinition('URI');
- return serialize($this);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema.php
deleted file mode 100644
index 67be5c71f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * Configuration definition, defines directives and their defaults.
- */
-class HTMLPurifier_ConfigSchema {
-
- /**
- * Defaults of the directives and namespaces.
- * @note This shares the exact same structure as HTMLPurifier_Config::$conf
- */
- public $defaults = array();
-
- /**
- * The default property list. Do not edit this property list.
- */
- public $defaultPlist;
-
- /**
- * Definition of the directives. The structure of this is:
- *
- * array(
- * 'Namespace' => array(
- * 'Directive' => new stdclass(),
- * )
- * )
- *
- * The stdclass may have the following properties:
- *
- * - If isAlias isn't set:
- * - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
- * - allow_null: If set, this directive allows null values
- * - aliases: If set, an associative array of value aliases to real values
- * - allowed: If set, a lookup array of allowed (string) values
- * - If isAlias is set:
- * - namespace: Namespace this directive aliases to
- * - name: Directive name this directive aliases to
- *
- * In certain degenerate cases, stdclass will actually be an integer. In
- * that case, the value is equivalent to an stdclass with the type
- * property set to the integer. If the integer is negative, type is
- * equal to the absolute value of integer, and allow_null is true.
- *
- * This class is friendly with HTMLPurifier_Config. If you need introspection
- * about the schema, you're better of using the ConfigSchema_Interchange,
- * which uses more memory but has much richer information.
- */
- public $info = array();
-
- /**
- * Application-wide singleton
- */
- static protected $singleton;
-
- public function __construct() {
- $this->defaultPlist = new HTMLPurifier_PropertyList();
- }
-
- /**
- * Unserializes the default ConfigSchema.
- */
- public static function makeFromSerial() {
- return unserialize(file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser'));
- }
-
- /**
- * Retrieves an instance of the application-wide configuration definition.
- */
- public static function instance($prototype = null) {
- if ($prototype !== null) {
- HTMLPurifier_ConfigSchema::$singleton = $prototype;
- } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
- HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
- }
- return HTMLPurifier_ConfigSchema::$singleton;
- }
-
- /**
- * Defines a directive for configuration
- * @warning Will fail of directive's namespace is defined.
- * @warning This method's signature is slightly different from the legacy
- * define() static method! Beware!
- * @param $namespace Namespace the directive is in
- * @param $name Key of directive
- * @param $default Default value of directive
- * @param $type Allowed type of the directive. See
- * HTMLPurifier_DirectiveDef::$type for allowed values
- * @param $allow_null Whether or not to allow null values
- */
- public function add($key, $default, $type, $allow_null) {
- $obj = new stdclass();
- $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
- if ($allow_null) $obj->allow_null = true;
- $this->info[$key] = $obj;
- $this->defaults[$key] = $default;
- $this->defaultPlist->set($key, $default);
- }
-
- /**
- * Defines a directive value alias.
- *
- * Directive value aliases are convenient for developers because it lets
- * them set a directive to several values and get the same result.
- * @param $namespace Directive's namespace
- * @param $name Name of Directive
- * @param $aliases Hash of aliased values to the real alias
- */
- public function addValueAliases($key, $aliases) {
- if (!isset($this->info[$key]->aliases)) {
- $this->info[$key]->aliases = array();
- }
- foreach ($aliases as $alias => $real) {
- $this->info[$key]->aliases[$alias] = $real;
- }
- }
-
- /**
- * Defines a set of allowed values for a directive.
- * @warning This is slightly different from the corresponding static
- * method definition.
- * @param $namespace Namespace of directive
- * @param $name Name of directive
- * @param $allowed Lookup array of allowed values
- */
- public function addAllowedValues($key, $allowed) {
- $this->info[$key]->allowed = $allowed;
- }
-
- /**
- * Defines a directive alias for backwards compatibility
- * @param $namespace
- * @param $name Directive that will be aliased
- * @param $new_namespace
- * @param $new_name Directive that the alias will be to
- */
- public function addAlias($key, $new_key) {
- $obj = new stdclass;
- $obj->key = $new_key;
- $obj->isAlias = true;
- $this->info[$key] = $obj;
- }
-
- /**
- * Replaces any stdclass that only has the type property with type integer.
- */
- public function postProcess() {
- foreach ($this->info as $key => $v) {
- if (count((array) $v) == 1) {
- $this->info[$key] = $v->type;
- } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
- $this->info[$key] = -$v->type;
- }
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
deleted file mode 100644
index c05668a70..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
- * representation used to perform checks on user configuration.
- */
-class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
-{
-
- public function build($interchange) {
- $schema = new HTMLPurifier_ConfigSchema();
- foreach ($interchange->directives as $d) {
- $schema->add(
- $d->id->key,
- $d->default,
- $d->type,
- $d->typeAllowsNull
- );
- if ($d->allowed !== null) {
- $schema->addAllowedValues(
- $d->id->key,
- $d->allowed
- );
- }
- foreach ($d->aliases as $alias) {
- $schema->addAlias(
- $alias->key,
- $d->id->key
- );
- }
- if ($d->valueAliases !== null) {
- $schema->addValueAliases(
- $d->id->key,
- $d->valueAliases
- );
- }
- }
- $schema->postProcess();
- return $schema;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
deleted file mode 100644
index 244561a37..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
- * which can be further processed to generate documentation.
- */
-class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
-{
-
- protected $interchange;
- private $namespace;
-
- protected function writeHTMLDiv($html) {
- $this->startElement('div');
-
- $purifier = HTMLPurifier::getInstance();
- $html = $purifier->purify($html);
- $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
- $this->writeRaw($html);
-
- $this->endElement(); // div
- }
-
- protected function export($var) {
- if ($var === array()) return 'array()';
- return var_export($var, true);
- }
-
- public function build($interchange) {
- // global access, only use as last resort
- $this->interchange = $interchange;
-
- $this->setIndent(true);
- $this->startDocument('1.0', 'UTF-8');
- $this->startElement('configdoc');
- $this->writeElement('title', $interchange->name);
-
- foreach ($interchange->directives as $directive) {
- $this->buildDirective($directive);
- }
-
- if ($this->namespace) $this->endElement(); // namespace
-
- $this->endElement(); // configdoc
- $this->flush();
- }
-
- public function buildDirective($directive) {
-
- // Kludge, although I suppose having a notion of a "root namespace"
- // certainly makes things look nicer when documentation is built.
- // Depends on things being sorted.
- if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
- if ($this->namespace) $this->endElement(); // namespace
- $this->namespace = $directive->id->getRootNamespace();
- $this->startElement('namespace');
- $this->writeAttribute('id', $this->namespace);
- $this->writeElement('name', $this->namespace);
- }
-
- $this->startElement('directive');
- $this->writeAttribute('id', $directive->id->toString());
-
- $this->writeElement('name', $directive->id->getDirective());
-
- $this->startElement('aliases');
- foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
- $this->endElement(); // aliases
-
- $this->startElement('constraints');
- if ($directive->version) $this->writeElement('version', $directive->version);
- $this->startElement('type');
- if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
- $this->text($directive->type);
- $this->endElement(); // type
- if ($directive->allowed) {
- $this->startElement('allowed');
- foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
- $this->endElement(); // allowed
- }
- $this->writeElement('default', $this->export($directive->default));
- $this->writeAttribute('xml:space', 'preserve');
- if ($directive->external) {
- $this->startElement('external');
- foreach ($directive->external as $project) $this->writeElement('project', $project);
- $this->endElement();
- }
- $this->endElement(); // constraints
-
- if ($directive->deprecatedVersion) {
- $this->startElement('deprecated');
- $this->writeElement('version', $directive->deprecatedVersion);
- $this->writeElement('use', $directive->deprecatedUse->toString());
- $this->endElement(); // deprecated
- }
-
- $this->startElement('description');
- $this->writeHTMLDiv($directive->description);
- $this->endElement(); // description
-
- $this->endElement(); // directive
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
deleted file mode 100644
index 2671516c5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Exceptions related to configuration schema
- */
-class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
deleted file mode 100644
index 91a5aa730..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Generic schema interchange format that can be converted to a runtime
- * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
- * are completely validated.
- */
-class HTMLPurifier_ConfigSchema_Interchange
-{
-
- /**
- * Name of the application this schema is describing.
- */
- public $name;
-
- /**
- * Array of Directive ID => array(directive info)
- */
- public $directives = array();
-
- /**
- * Adds a directive array to $directives
- */
- public function addDirective($directive) {
- if (isset($this->directives[$i = $directive->id->toString()])) {
- throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
- }
- $this->directives[$i] = $directive;
- }
-
- /**
- * Convenience function to perform standard validation. Throws exception
- * on failed validation.
- */
- public function validate() {
- $validator = new HTMLPurifier_ConfigSchema_Validator();
- return $validator->validate($this);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
deleted file mode 100644
index ac8be0d97..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Interchange component class describing configuration directives.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Directive
-{
-
- /**
- * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
- */
- public $id;
-
- /**
- * String type, e.g. 'integer' or 'istring'.
- */
- public $type;
-
- /**
- * Default value, e.g. 3 or 'DefaultVal'.
- */
- public $default;
-
- /**
- * HTML description.
- */
- public $description;
-
- /**
- * Boolean whether or not null is allowed as a value.
- */
- public $typeAllowsNull = false;
-
- /**
- * Lookup table of allowed scalar values, e.g. array('allowed' => true).
- * Null if all values are allowed.
- */
- public $allowed;
-
- /**
- * List of aliases for the directive,
- * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
- */
- public $aliases = array();
-
- /**
- * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
- * aliasing is disabled (necessary for non-scalar types).
- */
- public $valueAliases;
-
- /**
- * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
- * Null if the directive has always existed.
- */
- public $version;
-
- /**
- * ID of directive that supercedes this old directive, is an instance
- * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
- */
- public $deprecatedUse;
-
- /**
- * Version of HTML Purifier this directive was deprecated. Null if not
- * deprecated.
- */
- public $deprecatedVersion;
-
- /**
- * List of external projects this directive depends on, e.g. array('CSSTidy').
- */
- public $external = array();
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
deleted file mode 100644
index b9b3c6f5c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Represents a directive ID in the interchange format.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Id
-{
-
- public $key;
-
- public function __construct($key) {
- $this->key = $key;
- }
-
- /**
- * @warning This is NOT magic, to ensure that people don't abuse SPL and
- * cause problems for PHP 5.0 support.
- */
- public function toString() {
- return $this->key;
- }
-
- public function getRootNamespace() {
- return substr($this->key, 0, strpos($this->key, "."));
- }
-
- public function getDirective() {
- return substr($this->key, strpos($this->key, ".") + 1);
- }
-
- public static function make($id) {
- return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
deleted file mode 100644
index 785b72ce8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-class HTMLPurifier_ConfigSchema_InterchangeBuilder
-{
-
- /**
- * Used for processing DEFAULT, nothing else.
- */
- protected $varParser;
-
- public function __construct($varParser = null) {
- $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
- }
-
- public static function buildFromDirectory($dir = null) {
- $builder = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
- $interchange = new HTMLPurifier_ConfigSchema_Interchange();
- return $builder->buildDir($interchange, $dir);
- }
-
- public function buildDir($interchange, $dir = null) {
- if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
- if (file_exists($dir . '/info.ini')) {
- $info = parse_ini_file($dir . '/info.ini');
- $interchange->name = $info['name'];
- }
-
- $files = array();
- $dh = opendir($dir);
- while (false !== ($file = readdir($dh))) {
- if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
- continue;
- }
- $files[] = $file;
- }
- closedir($dh);
-
- sort($files);
- foreach ($files as $file) {
- $this->buildFile($interchange, $dir . '/' . $file);
- }
-
- return $interchange;
- }
-
- public function buildFile($interchange, $file) {
- $parser = new HTMLPurifier_StringHashParser();
- $this->build(
- $interchange,
- new HTMLPurifier_StringHash( $parser->parseFile($file) )
- );
- }
-
- /**
- * Builds an interchange object based on a hash.
- * @param $interchange HTMLPurifier_ConfigSchema_Interchange object to build
- * @param $hash HTMLPurifier_ConfigSchema_StringHash source data
- */
- public function build($interchange, $hash) {
- if (!$hash instanceof HTMLPurifier_StringHash) {
- $hash = new HTMLPurifier_StringHash($hash);
- }
- if (!isset($hash['ID'])) {
- throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
- }
- if (strpos($hash['ID'], '.') === false) {
- if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
- $hash->offsetGet('DESCRIPTION'); // prevent complaining
- } else {
- throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
- }
- } else {
- $this->buildDirective($interchange, $hash);
- }
- $this->_findUnused($hash);
- }
-
- public function buildDirective($interchange, $hash) {
- $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
-
- // These are required elements:
- $directive->id = $this->id($hash->offsetGet('ID'));
- $id = $directive->id->toString(); // convenience
-
- if (isset($hash['TYPE'])) {
- $type = explode('/', $hash->offsetGet('TYPE'));
- if (isset($type[1])) $directive->typeAllowsNull = true;
- $directive->type = $type[0];
- } else {
- throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
- }
-
- if (isset($hash['DEFAULT'])) {
- try {
- $directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
- } catch (HTMLPurifier_VarParserException $e) {
- throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
- }
- }
-
- if (isset($hash['DESCRIPTION'])) {
- $directive->description = $hash->offsetGet('DESCRIPTION');
- }
-
- if (isset($hash['ALLOWED'])) {
- $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
- }
-
- if (isset($hash['VALUE-ALIASES'])) {
- $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
- }
-
- if (isset($hash['ALIASES'])) {
- $raw_aliases = trim($hash->offsetGet('ALIASES'));
- $aliases = preg_split('/\s*,\s*/', $raw_aliases);
- foreach ($aliases as $alias) {
- $directive->aliases[] = $this->id($alias);
- }
- }
-
- if (isset($hash['VERSION'])) {
- $directive->version = $hash->offsetGet('VERSION');
- }
-
- if (isset($hash['DEPRECATED-USE'])) {
- $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
- }
-
- if (isset($hash['DEPRECATED-VERSION'])) {
- $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
- }
-
- if (isset($hash['EXTERNAL'])) {
- $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
- }
-
- $interchange->addDirective($directive);
- }
-
- /**
- * Evaluates an array PHP code string without array() wrapper
- */
- protected function evalArray($contents) {
- return eval('return array('. $contents .');');
- }
-
- /**
- * Converts an array list into a lookup array.
- */
- protected function lookup($array) {
- $ret = array();
- foreach ($array as $val) $ret[$val] = true;
- return $ret;
- }
-
- /**
- * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
- * object based on a string Id.
- */
- protected function id($id) {
- return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
- }
-
- /**
- * Triggers errors for any unused keys passed in the hash; such keys
- * may indicate typos, missing values, etc.
- * @param $hash Instance of ConfigSchema_StringHash to check.
- */
- protected function _findUnused($hash) {
- $accessed = $hash->getAccessed();
- foreach ($hash as $k => $v) {
- if (!isset($accessed[$k])) {
- trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
- }
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
deleted file mode 100644
index f374f6a02..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * Performs validations on HTMLPurifier_ConfigSchema_Interchange
- *
- * @note If you see '// handled by InterchangeBuilder', that means a
- * design decision in that class would prevent this validation from
- * ever being necessary. We have them anyway, however, for
- * redundancy.
- */
-class HTMLPurifier_ConfigSchema_Validator
-{
-
- /**
- * Easy to access global objects.
- */
- protected $interchange, $aliases;
-
- /**
- * Context-stack to provide easy to read error messages.
- */
- protected $context = array();
-
- /**
- * HTMLPurifier_VarParser to test default's type.
- */
- protected $parser;
-
- public function __construct() {
- $this->parser = new HTMLPurifier_VarParser();
- }
-
- /**
- * Validates a fully-formed interchange object. Throws an
- * HTMLPurifier_ConfigSchema_Exception if there's a problem.
- */
- public function validate($interchange) {
- $this->interchange = $interchange;
- $this->aliases = array();
- // PHP is a bit lax with integer <=> string conversions in
- // arrays, so we don't use the identical !== comparison
- foreach ($interchange->directives as $i => $directive) {
- $id = $directive->id->toString();
- if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
- $this->validateDirective($directive);
- }
- return true;
- }
-
- /**
- * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
- */
- public function validateId($id) {
- $id_string = $id->toString();
- $this->context[] = "id '$id_string'";
- if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
- // handled by InterchangeBuilder
- $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
- }
- // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
- // we probably should check that it has at least one namespace
- $this->with($id, 'key')
- ->assertNotEmpty()
- ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
- array_pop($this->context);
- }
-
- /**
- * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
- */
- public function validateDirective($d) {
- $id = $d->id->toString();
- $this->context[] = "directive '$id'";
- $this->validateId($d->id);
-
- $this->with($d, 'description')
- ->assertNotEmpty();
-
- // BEGIN - handled by InterchangeBuilder
- $this->with($d, 'type')
- ->assertNotEmpty();
- $this->with($d, 'typeAllowsNull')
- ->assertIsBool();
- try {
- // This also tests validity of $d->type
- $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
- } catch (HTMLPurifier_VarParserException $e) {
- $this->error('default', 'had error: ' . $e->getMessage());
- }
- // END - handled by InterchangeBuilder
-
- if (!is_null($d->allowed) || !empty($d->valueAliases)) {
- // allowed and valueAliases require that we be dealing with
- // strings, so check for that early.
- $d_int = HTMLPurifier_VarParser::$types[$d->type];
- if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
- $this->error('type', 'must be a string type when used with allowed or value aliases');
- }
- }
-
- $this->validateDirectiveAllowed($d);
- $this->validateDirectiveValueAliases($d);
- $this->validateDirectiveAliases($d);
-
- array_pop($this->context);
- }
-
- /**
- * Extra validation if $allowed member variable of
- * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
- */
- public function validateDirectiveAllowed($d) {
- if (is_null($d->allowed)) return;
- $this->with($d, 'allowed')
- ->assertNotEmpty()
- ->assertIsLookup(); // handled by InterchangeBuilder
- if (is_string($d->default) && !isset($d->allowed[$d->default])) {
- $this->error('default', 'must be an allowed value');
- }
- $this->context[] = 'allowed';
- foreach ($d->allowed as $val => $x) {
- if (!is_string($val)) $this->error("value $val", 'must be a string');
- }
- array_pop($this->context);
- }
-
- /**
- * Extra validation if $valueAliases member variable of
- * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
- */
- public function validateDirectiveValueAliases($d) {
- if (is_null($d->valueAliases)) return;
- $this->with($d, 'valueAliases')
- ->assertIsArray(); // handled by InterchangeBuilder
- $this->context[] = 'valueAliases';
- foreach ($d->valueAliases as $alias => $real) {
- if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
- if (!is_string($real)) $this->error("alias target $real from alias '$alias'", 'must be a string');
- if ($alias === $real) {
- $this->error("alias '$alias'", "must not be an alias to itself");
- }
- }
- if (!is_null($d->allowed)) {
- foreach ($d->valueAliases as $alias => $real) {
- if (isset($d->allowed[$alias])) {
- $this->error("alias '$alias'", 'must not be an allowed value');
- } elseif (!isset($d->allowed[$real])) {
- $this->error("alias '$alias'", 'must be an alias to an allowed value');
- }
- }
- }
- array_pop($this->context);
- }
-
- /**
- * Extra validation if $aliases member variable of
- * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
- */
- public function validateDirectiveAliases($d) {
- $this->with($d, 'aliases')
- ->assertIsArray(); // handled by InterchangeBuilder
- $this->context[] = 'aliases';
- foreach ($d->aliases as $alias) {
- $this->validateId($alias);
- $s = $alias->toString();
- if (isset($this->interchange->directives[$s])) {
- $this->error("alias '$s'", 'collides with another directive');
- }
- if (isset($this->aliases[$s])) {
- $other_directive = $this->aliases[$s];
- $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
- }
- $this->aliases[$s] = $d->id->toString();
- }
- array_pop($this->context);
- }
-
- // protected helper functions
-
- /**
- * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
- * for validating simple member variables of objects.
- */
- protected function with($obj, $member) {
- return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
- }
-
- /**
- * Emits an error, providing helpful context.
- */
- protected function error($target, $msg) {
- if ($target !== false) $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext();
- else $prefix = ucfirst($this->getFormattedContext());
- throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
- }
-
- /**
- * Returns a formatted context string.
- */
- protected function getFormattedContext() {
- return implode(' in ', array_reverse($this->context));
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
deleted file mode 100644
index b95aea18c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Fluent interface for validating the contents of member variables.
- * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
- * use-cases. We name this an 'atom' because it's ONLY for validations that
- * are independent and usually scalar.
- */
-class HTMLPurifier_ConfigSchema_ValidatorAtom
-{
-
- protected $context, $obj, $member, $contents;
-
- public function __construct($context, $obj, $member) {
- $this->context = $context;
- $this->obj = $obj;
- $this->member = $member;
- $this->contents =& $obj->$member;
- }
-
- public function assertIsString() {
- if (!is_string($this->contents)) $this->error('must be a string');
- return $this;
- }
-
- public function assertIsBool() {
- if (!is_bool($this->contents)) $this->error('must be a boolean');
- return $this;
- }
-
- public function assertIsArray() {
- if (!is_array($this->contents)) $this->error('must be an array');
- return $this;
- }
-
- public function assertNotNull() {
- if ($this->contents === null) $this->error('must not be null');
- return $this;
- }
-
- public function assertAlnum() {
- $this->assertIsString();
- if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
- return $this;
- }
-
- public function assertNotEmpty() {
- if (empty($this->contents)) $this->error('must not be empty');
- return $this;
- }
-
- public function assertIsLookup() {
- $this->assertIsArray();
- foreach ($this->contents as $v) {
- if ($v !== true) $this->error('must be a lookup array');
- }
- return $this;
- }
-
- protected function error($msg) {
- throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
deleted file mode 100644
index bbf12f9c3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
+++ /dev/null
Binary files differ
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
deleted file mode 100644
index 0517fed0a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.AllowedClasses
-TYPE: lookup/null
-VERSION: 4.0.0
-DEFAULT: null
---DESCRIPTION--
-List of allowed class values in the class attribute. By default, this is null,
-which means all classes are allowed.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
deleted file mode 100644
index 249edd647..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Attr.AllowedFrameTargets
-TYPE: lookup
-DEFAULT: array()
---DESCRIPTION--
-Lookup table of all allowed link frame targets. Some commonly used link
-targets include _blank, _self, _parent and _top. Values should be
-lowercase, as validation will be done in a case-sensitive manner despite
-W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
-so this directive will have no effect in that doctype. XHTML 1.1 does not
-enable the Target module by default, you will have to manually enable it
-(see the module documentation for more details.)
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
deleted file mode 100644
index 9a8fa6a2e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.AllowedRel
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed forward document relationships in the rel attribute. Common
-values may be nofollow or print. By default, this is empty, meaning that no
-document relationships are allowed.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
deleted file mode 100644
index b01788348..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.AllowedRev
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed reverse document relationships in the rev attribute. This
-attribute is a bit of an edge-case; if you don't know what it is for, stay
-away.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
deleted file mode 100644
index e774b823b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Attr.ClassUseCDATA
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.0.0
---DESCRIPTION--
-If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
-XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
-it will use a relaxed CDATA definition. If true, the relaxed CDATA definition
-is forced; if false, the NMTOKENS definition is forced. To get behavior
-of HTML Purifier prior to 4.0.0, set this directive to false.
-
-Some rational behind the auto-detection:
-in previous versions of HTML Purifier, it was assumed that the form of
-class was NMTOKENS, as specified by the XHTML Modularization (representing
-XHTML 1.1 and XHTML 2.0). The DTDs for HTML 4.01 and XHTML 1.0, however
-specify class as CDATA. HTML 5 effectively defines it as CDATA, but
-with the additional constraint that each name should be unique (this is not
-explicitly outlined in previous specifications).
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
deleted file mode 100644
index 533165e17..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Attr.DefaultImageAlt
-TYPE: string/null
-DEFAULT: null
-VERSION: 3.2.0
---DESCRIPTION--
-This is the content of the alt tag of an image if the user had not
-previously specified an alt attribute. This applies to all images without
-a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
-only applies to invalid images, and overrides in the case of an invalid image.
-Default behavior with null is to use the basename of the src tag for the alt.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
deleted file mode 100644
index 9eb7e3846..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.DefaultInvalidImage
-TYPE: string
-DEFAULT: ''
---DESCRIPTION--
-This is the default image an img tag will be pointed to if it does not have
-a valid src attribute. In future versions, we may allow the image tag to
-be removed completely, but due to design issues, this is not possible right
-now.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
deleted file mode 100644
index 2f17bf477..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.DefaultInvalidImageAlt
-TYPE: string
-DEFAULT: 'Invalid image'
---DESCRIPTION--
-This is the content of the alt tag of an invalid image if the user had not
-previously specified an alt attribute. It has no effect when the image is
-valid but there was no alt attribute present.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
deleted file mode 100644
index 52654b53a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Attr.DefaultTextDir
-TYPE: string
-DEFAULT: 'ltr'
---DESCRIPTION--
-Defines the default text direction (ltr or rtl) of the document being
-parsed. This generally is the same as the value of the dir attribute in
-HTML, or ltr if that is not specified.
---ALLOWED--
-'ltr', 'rtl'
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
deleted file mode 100644
index 6440d2103..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Attr.EnableID
-TYPE: bool
-DEFAULT: false
-VERSION: 1.2.0
---DESCRIPTION--
-Allows the ID attribute in HTML. This is disabled by default due to the
-fact that without proper configuration user input can easily break the
-validation of a webpage by specifying an ID that is already on the
-surrounding HTML. If you don't mind throwing caution to the wind, enable
-this directive, but I strongly recommend you also consider blacklisting IDs
-you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
-(%Attr.IDPrefix). When set to true HTML Purifier reverts to the behavior of
-pre-1.2.0 versions.
---ALIASES--
-HTML.EnableAttrID
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
deleted file mode 100644
index f31d226f5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.ForbiddenClasses
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array()
---DESCRIPTION--
-List of forbidden class values in the class attribute. By default, this is
-empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
deleted file mode 100644
index 5f2b5e3d2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Attr.IDBlacklist
-TYPE: list
-DEFAULT: array()
-DESCRIPTION: Array of IDs not allowed in the document.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
deleted file mode 100644
index 6f5824586..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.IDBlacklistRegexp
-TYPE: string/null
-VERSION: 1.6.0
-DEFAULT: NULL
---DESCRIPTION--
-PCRE regular expression to be matched against all IDs. If the expression is
-matches, the ID is rejected. Use this with care: may cause significant
-degradation. ID matching is done after all other validation.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
deleted file mode 100644
index cc49d43fd..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Attr.IDPrefix
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-String to prefix to IDs. If you have no idea what IDs your pages may use,
-you may opt to simply add a prefix to all user-submitted ID attributes so
-that they are still usable, but will not conflict with core page IDs.
-Example: setting the directive to 'user_' will result in a user submitted
-'foo' to become 'user_foo' Be sure to set %HTML.EnableAttrID to true
-before using this.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
deleted file mode 100644
index 2c5924a7a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Attr.IDPrefixLocal
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-Temporary prefix for IDs used in conjunction with %Attr.IDPrefix. If you
-need to allow multiple sets of user content on web page, you may need to
-have a seperate prefix that changes with each iteration. This way,
-seperately submitted user content displayed on the same page doesn't
-clobber each other. Ideal values are unique identifiers for the content it
-represents (i.e. the id of the row in the database). Be sure to add a
-seperator (like an underscore) at the end. Warning: this directive will
-not work unless %Attr.IDPrefix is set to a non-empty value!
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
deleted file mode 100644
index d5caa1bb9..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-AutoFormat.AutoParagraph
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- This directive turns on auto-paragraphing, where double newlines are
- converted in to paragraphs whenever possible. Auto-paragraphing:
-</p>
-<ul>
- <li>Always applies to inline elements or text in the root node,</li>
- <li>Applies to inline elements or text with double newlines in nodes
- that allow paragraph tags,</li>
- <li>Applies to double newlines in paragraph tags</li>
-</ul>
-<p>
- <code>p</code> tags must be allowed for this directive to take effect.
- We do not use <code>br</code> tags for paragraphing, as that is
- semantically incorrect.
-</p>
-<p>
- To prevent auto-paragraphing as a content-producer, refrain from using
- double-newlines except to specify a new paragraph or in contexts where
- it has special meaning (whitespace usually has no meaning except in
- tags like <code>pre</code>, so this should not be difficult.) To prevent
- the paragraphing of inline text adjacent to block elements, wrap them
- in <code>div</code> tags (the behavior is slightly different outside of
- the root node.)
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
deleted file mode 100644
index 2a476481a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.Custom
-TYPE: list
-VERSION: 2.0.1
-DEFAULT: array()
---DESCRIPTION--
-
-<p>
- This directive can be used to add custom auto-format injectors.
- Specify an array of injector names (class name minus the prefix)
- or concrete implementations. Injector class must exist.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
deleted file mode 100644
index 663064a34..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.DisplayLinkURI
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- This directive turns on the in-text display of URIs in &lt;a&gt; tags, and disables
- those links. For example, <a href="http://example.com">example</a> becomes
- example (<a>http://example.com</a>).
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
deleted file mode 100644
index 3a48ba960..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.Linkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- This directive turns on linkification, auto-linking http, ftp and
- https URLs. <code>a</code> tags with the <code>href</code> attribute
- must be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
deleted file mode 100644
index db58b1346..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.PurifierLinkify.DocURL
-TYPE: string
-VERSION: 2.0.1
-DEFAULT: '#%s'
-ALIASES: AutoFormatParam.PurifierLinkifyDocURL
---DESCRIPTION--
-<p>
- Location of configuration documentation to link to, let %s substitute
- into the configuration's namespace and directive names sans the percent
- sign.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
deleted file mode 100644
index 7996488be..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.PurifierLinkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Internal auto-formatter that converts configuration directives in
- syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
- with the <code>href</code> attribute must be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
deleted file mode 100644
index 35c393b4e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array('td' => true, 'th' => true)
---DESCRIPTION--
-<p>
- When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
- are enabled, this directive defines what HTML elements should not be
- removede if they have only a non-breaking space in them.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
deleted file mode 100644
index ca17eb1dc..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-AutoFormat.RemoveEmpty.RemoveNbsp
-TYPE: bool
-VERSION: 4.0.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- When enabled, HTML Purifier will treat any elements that contain only
- non-breaking spaces as well as regular whitespace as empty, and remove
- them when %AutoForamt.RemoveEmpty is enabled.
-</p>
-<p>
- See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
- that don't have this behavior applied to them.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
deleted file mode 100644
index 34657ba47..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-AutoFormat.RemoveEmpty
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- When enabled, HTML Purifier will attempt to remove empty elements that
- contribute no semantic information to the document. The following types
- of nodes will be removed:
-</p>
-<ul><li>
- Tags with no attributes and no content, and that are not empty
- elements (remove <code>&lt;a&gt;&lt;/a&gt;</code> but not
- <code>&lt;br /&gt;</code>), and
- </li>
- <li>
- Tags with no content, except for:<ul>
- <li>The <code>colgroup</code> element, or</li>
- <li>
- Elements with the <code>id</code> or <code>name</code> attribute,
- when those attributes are permitted on those elements.
- </li>
- </ul></li>
-</ul>
-<p>
- Please be very careful when using this functionality; while it may not
- seem that empty elements contain useful information, they can alter the
- layout of a document given appropriate styling. This directive is most
- useful when you are processing machine-generated HTML, please avoid using
- it on regular user HTML.
-</p>
-<p>
- Elements that contain only whitespace will be treated as empty. Non-breaking
- spaces, however, do not count as whitespace. See
- %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
-</p>
-<p>
- This algorithm is not perfect; you may still notice some empty tags,
- particularly if a node had elements, but those elements were later removed
- because they were not permitted in that context, or tags that, after
- being auto-closed by another tag, where empty. This is for safety reasons
- to prevent clever code from breaking validation. The general rule of thumb:
- if a tag looked empty on the way in, it will get removed; if HTML Purifier
- made it empty, it will stay.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
deleted file mode 100644
index b324608f7..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CSS.AllowImportant
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not !important cascade modifiers should
-be allowed in user CSS. If false, !important will stripped.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
deleted file mode 100644
index 748be0eec..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.AllowTricky
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not to allow "tricky" CSS properties and
-values. Tricky CSS properties/values can drastically modify page layout or
-be used for deceptive practices but do not directly constitute a security risk.
-For example, <code>display:none;</code> is considered a tricky property that
-will only be allowed if this directive is set to true.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
deleted file mode 100644
index 460112ebe..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-CSS.AllowedProperties
-TYPE: lookup/null
-VERSION: 3.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- If HTML Purifier's style attributes set is unsatisfactory for your needs,
- you can overload it with your own list of tags to allow. Note that this
- method is subtractive: it does its job by taking away from HTML Purifier
- usual feature set, so you cannot add an attribute that HTML Purifier never
- supported in the first place.
-</p>
-<p>
- <strong>Warning:</strong> If another directive conflicts with the
- elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
deleted file mode 100644
index 5cb7dda3b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
- Revision identifier for your custom definition. See
- %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
deleted file mode 100644
index 7a3291470..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-CSS.MaxImgLength
-TYPE: string/null
-DEFAULT: '1200px'
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This parameter sets the maximum allowed length on <code>img</code> tags,
- effectively the <code>width</code> and <code>height</code> properties.
- Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %HTML.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the CSS max is a number with
- a unit).
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
deleted file mode 100644
index 148eedb8b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CSS.Proprietary
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Whether or not to allow safe, proprietary CSS values.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
deleted file mode 100644
index c486724c8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Cache.DefinitionImpl
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: 'Serializer'
---DESCRIPTION--
-
-This directive defines which method to use when caching definitions,
-the complex data-type that makes HTML Purifier tick. Set to null
-to disable caching (not recommended, as you will see a definite
-performance degradation).
-
---ALIASES--
-Core.DefinitionCache
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
deleted file mode 100644
index 54036507d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Cache.SerializerPath
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Absolute path with no trailing slash to store serialized definitions in.
- Default is within the
- HTML Purifier library inside DefinitionCache/Serializer. This
- path must be writable by the webserver.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
deleted file mode 100644
index 568cbf3b3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Core.AggressivelyFixLt
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: true
---DESCRIPTION--
-<p>
- This directive enables aggressive pre-filter fixes HTML Purifier can
- perform in order to ensure that open angled-brackets do not get killed
- during parsing stage. Enabling this will result in two preg_replace_callback
- calls and at least two preg_replace calls for every HTML document parsed;
- if your users make very well-formed HTML, you can set this directive false.
- This has no effect when DirectLex is used.
-</p>
-<p>
- <strong>Notice:</strong> This directive's default turned from false to true
- in HTML Purifier 3.2.0.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
deleted file mode 100644
index d7317911f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.CollectErrors
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-
-Whether or not to collect errors found while filtering the document. This
-is a useful way to give feedback to your users. <strong>Warning:</strong>
-Currently this feature is very patchy and experimental, with lots of
-possible error messages not yet implemented. It will not cause any
-problems, but it may not help your users either.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
deleted file mode 100644
index 08b381d34..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Core.ColorKeywords
-TYPE: hash
-VERSION: 2.0.0
---DEFAULT--
-array (
- 'maroon' => '#800000',
- 'red' => '#FF0000',
- 'orange' => '#FFA500',
- 'yellow' => '#FFFF00',
- 'olive' => '#808000',
- 'purple' => '#800080',
- 'fuchsia' => '#FF00FF',
- 'white' => '#FFFFFF',
- 'lime' => '#00FF00',
- 'green' => '#008000',
- 'navy' => '#000080',
- 'blue' => '#0000FF',
- 'aqua' => '#00FFFF',
- 'teal' => '#008080',
- 'black' => '#000000',
- 'silver' => '#C0C0C0',
- 'gray' => '#808080',
-)
---DESCRIPTION--
-
-Lookup array of color names to six digit hexadecimal number corresponding
-to color, with preceding hash mark. Used when parsing colors.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
deleted file mode 100644
index 64b114fce..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Core.ConvertDocumentToFragment
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-
-This parameter determines whether or not the filter should convert
-input that is a full document with html and body tags to a fragment
-of just the contents of a body tag. This parameter is simply something
-HTML Purifier can do during an edge-case: for most inputs, this
-processing is not necessary.
-
---ALIASES--
-Core.AcceptFullDocuments
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
deleted file mode 100644
index 36f16e07e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Core.DirectLexLineNumberSyncInterval
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 0
---DESCRIPTION--
-
-<p>
- Specifies the number of tokens the DirectLex line number tracking
- implementations should process before attempting to resyncronize the
- current line count by manually counting all previous new-lines. When
- at 0, this functionality is disabled. Lower values will decrease
- performance, and this is only strictly necessary if the counting
- algorithm is buggy (in which case you should report it as a bug).
- This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
- not being used.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
deleted file mode 100644
index 8bfb47c3a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Core.Encoding
-TYPE: istring
-DEFAULT: 'utf-8'
---DESCRIPTION--
-If for some reason you are unable to convert all webpages to UTF-8, you can
-use this directive as a stop-gap compatibility change to let HTML Purifier
-deal with non UTF-8 input. This technique has notable deficiencies:
-absolutely no characters outside of the selected character encoding will be
-preserved, not even the ones that have been ampersand escaped (this is due
-to a UTF-8 specific <em>feature</em> that automatically resolves all
-entities), making it pretty useless for anything except the most I18N-blind
-applications, although %Core.EscapeNonASCIICharacters offers fixes this
-trouble with another tradeoff. This directive only accepts ISO-8859-1 if
-iconv is not enabled.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
deleted file mode 100644
index 4d5b5055c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Core.EscapeInvalidChildren
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, a child is found that is not allowed in the context of the
-parent element will be transformed into text as if it were ASCII. When
-false, that element and all internal tags will be dropped, though text will
-be preserved. There is no option for dropping the element but preserving
-child nodes.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
deleted file mode 100644
index a7a5b249b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Core.EscapeInvalidTags
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, invalid tags will be written back to the document as plain text.
-Otherwise, they are silently dropped.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
deleted file mode 100644
index abb499948..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Core.EscapeNonASCIICharacters
-TYPE: bool
-VERSION: 1.4.0
-DEFAULT: false
---DESCRIPTION--
-This directive overcomes a deficiency in %Core.Encoding by blindly
-converting all non-ASCII characters into decimal numeric entities before
-converting it to its native encoding. This means that even characters that
-can be expressed in the non-UTF-8 encoding will be entity-ized, which can
-be a real downer for encodings like Big5. It also assumes that the ASCII
-repetoire is available, although this is the case for almost all encodings.
-Anyway, use UTF-8!
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
deleted file mode 100644
index 915391edb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Core.HiddenElements
-TYPE: lookup
---DEFAULT--
-array (
- 'script' => true,
- 'style' => true,
-)
---DESCRIPTION--
-
-<p>
- This directive is a lookup array of elements which should have their
- contents removed when they are not allowed by the HTML definition.
- For example, the contents of a <code>script</code> tag are not
- normally shown in a document, so if script tags are to be removed,
- their contents should be removed to. This is opposed to a <code>b</code>
- tag, which defines some presentational changes but does not hide its
- contents.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
deleted file mode 100644
index 233fca14f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Core.Language
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'en'
---DESCRIPTION--
-
-ISO 639 language code for localizable things in HTML Purifier to use,
-which is mainly error reporting. There is currently only an English (en)
-translation, so this directive is currently useless.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
deleted file mode 100644
index 8983e2cca..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Core.LexerImpl
-TYPE: mixed/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- This parameter determines what lexer implementation can be used. The
- valid values are:
-</p>
-<dl>
- <dt><em>null</em></dt>
- <dd>
- Recommended, the lexer implementation will be auto-detected based on
- your PHP-version and configuration.
- </dd>
- <dt><em>string</em> lexer identifier</dt>
- <dd>
- This is a slim way of manually overridding the implementation.
- Currently recognized values are: DOMLex (the default PHP5
-implementation)
- and DirectLex (the default PHP4 implementation). Only use this if
- you know what you are doing: usually, the auto-detection will
- manage things for cases you aren't even aware of.
- </dd>
- <dt><em>object</em> lexer instance</dt>
- <dd>
- Super-advanced: you can specify your own, custom, implementation that
- implements the interface defined by <code>HTMLPurifier_Lexer</code>.
- I may remove this option simply because I don't expect anyone
- to use it.
- </dd>
-</dl>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
deleted file mode 100644
index eb841a759..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Core.MaintainLineNumbers
-TYPE: bool/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- If true, HTML Purifier will add line number information to all tokens.
- This is useful when error reporting is turned on, but can result in
- significant performance degradation and should not be used when
- unnecessary. This directive must be used with the DirectLex lexer,
- as the DOMLex lexer does not (yet) support this functionality.
- If the value is null, an appropriate value will be selected based
- on other configuration.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
deleted file mode 100644
index 4070c2a0d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.RemoveInvalidImg
-TYPE: bool
-DEFAULT: true
-VERSION: 1.3.0
---DESCRIPTION--
-
-<p>
- This directive enables pre-emptive URI checking in <code>img</code>
- tags, as the attribute validation strategy is not authorized to
- remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
deleted file mode 100644
index a4cd966df..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.RemoveScriptContents
-TYPE: bool/null
-DEFAULT: NULL
-VERSION: 2.0.0
-DEPRECATED-VERSION: 2.1.0
-DEPRECATED-USE: Core.HiddenElements
---DESCRIPTION--
-<p>
- This directive enables HTML Purifier to remove not only script tags
- but all of their contents.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
deleted file mode 100644
index 3db50ef20..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Filter.Custom
-TYPE: list
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- This directive can be used to add custom filters; it is nearly the
- equivalent of the now deprecated <code>HTMLPurifier-&gt;addFilter()</code>
- method. Specify an array of concrete implementations.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
deleted file mode 100644
index 16829bcda..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Filter.ExtractStyleBlocks.Escaping
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: true
-ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
---DESCRIPTION--
-
-<p>
- Whether or not to escape the dangerous characters &lt;, &gt; and &amp;
- as \3C, \3E and \26, respectively. This is can be safely set to false
- if the contents of StyleBlocks will be placed in an external stylesheet,
- where there is no risk of it being interpreted as HTML.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
deleted file mode 100644
index 7f95f54d1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Filter.ExtractStyleBlocks.Scope
-TYPE: string/null
-VERSION: 3.0.0
-DEFAULT: NULL
-ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
---DESCRIPTION--
-
-<p>
- If you would like users to be able to define external stylesheets, but
- only allow them to specify CSS declarations for a specific node and
- prevent them from fiddling with other elements, use this directive.
- It accepts any valid CSS selector, and will prepend this to any
- CSS declaration extracted from the document. For example, if this
- directive is set to <code>#user-content</code> and a user uses the
- selector <code>a:hover</code>, the final selector will be
- <code>#user-content a:hover</code>.
-</p>
-<p>
- The comma shorthand may be used; consider the above example, with
- <code>#user-content, #user-content2</code>, the final selector will
- be <code>#user-content a:hover, #user-content2 a:hover</code>.
-</p>
-<p>
- <strong>Warning:</strong> It is possible for users to bypass this measure
- using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
- Purifier, and I am working to get it fixed. Until then, HTML Purifier
- performs a basic check to prevent this.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
deleted file mode 100644
index 6c231b2d7..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Filter.ExtractStyleBlocks.TidyImpl
-TYPE: mixed/null
-VERSION: 3.1.0
-DEFAULT: NULL
-ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
---DESCRIPTION--
-<p>
- If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
- class to use for internal cleaning. This will usually be good enough.
-</p>
-<p>
- However, for trusted user input, you can set this to <code>false</code> to
- disable cleaning. In addition, you can supply your own concrete implementation
- of Tidy's interface to use, although I don't know why you'd want to do that.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
deleted file mode 100644
index 078d08741..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Filter.ExtractStyleBlocks
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
-EXTERNAL: CSSTidy
---DESCRIPTION--
-<p>
- This directive turns on the style block extraction filter, which removes
- <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
- and places them in the <code>StyleBlocks</code> context variable, for further
- use by you, usually to be placed in an external stylesheet, or a
- <code>style</code> block in the <code>head</code> of your document.
-</p>
-<p>
- Sample usage:
-</p>
-<pre><![CDATA[
-<?php
- header('Content-type: text/html; charset=utf-8');
- echo '<?xml version="1.0" encoding="UTF-8"?>';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
- <title>Filter.ExtractStyleBlocks</title>
-<?php
- require_once '/path/to/library/HTMLPurifier.auto.php';
- require_once '/path/to/csstidy.class.php';
-
- $dirty = '<style>body {color:#F00;}</style> Some text';
-
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Filter', 'ExtractStyleBlocks', true);
- $purifier = new HTMLPurifier($config);
-
- $html = $purifier->purify($dirty);
-
- // This implementation writes the stylesheets to the styles/ directory.
- // You can also echo the styles inside the document, but it's a bit
- // more difficult to make sure they get interpreted properly by
- // browsers; try the usual CSS armoring techniques.
- $styles = $purifier->context->get('StyleBlocks');
- $dir = 'styles/';
- if (!is_dir($dir)) mkdir($dir);
- $hash = sha1($_GET['html']);
- foreach ($styles as $i => $style) {
- file_put_contents($name = $dir . $hash . "_$i");
- echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
- }
-?>
-</head>
-<body>
- <div>
- <?php echo $html; ?>
- </div>
-</b]]><![CDATA[ody>
-</html>
-]]></pre>
-<p>
- <strong>Warning:</strong> It is possible for a user to mount an
- imagecrash attack using this CSS. Counter-measures are difficult;
- it is not simply enough to limit the range of CSS lengths (using
- relative lengths with many nesting levels allows for large values
- to be attained without actually specifying them in the stylesheet),
- and the flexible nature of selectors makes it difficult to selectively
- disable lengths on image tags (HTML Purifier, however, does disable
- CSS width and height in inline styling). There are probably two effective
- counter measures: an explicit width and height set to auto in all
- images in your document (unlikely) or the disabling of width and
- height (somewhat reasonable). Whether or not these measures should be
- used is left to the reader.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
deleted file mode 100644
index 7fa6536b2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Filter.YouTube
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- This directive enables YouTube video embedding in HTML Purifier. Check
- <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
- on embedding videos</a> for more information on what this filter does.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
deleted file mode 100644
index 3e231d2d1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-HTML.Allowed
-TYPE: itext/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- This is a convenience directive that rolls the functionality of
- %HTML.AllowedElements and %HTML.AllowedAttributes into one directive.
- Specify elements and attributes that are allowed using:
- <code>element1[attr1|attr2],element2...</code>. You can also use
- newlines instead of commas to separate elements.
-</p>
-<p>
- <strong>Warning</strong>:
- All of the constraints on the component directives are still enforced.
- The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
- whitelist: directly copy-pasting it here will probably result in
- broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
- are set, this directive has no effect.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
deleted file mode 100644
index fcf093f17..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-HTML.AllowedAttributes
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- If HTML Purifier's attribute set is unsatisfactory, overload it!
- The syntax is "tag.attr" or "*.attr" for the global attributes
- (style, id, class, dir, lang, xml:lang).
-</p>
-<p>
- <strong>Warning:</strong> If another directive conflicts with the
- elements here, <em>that</em> directive will win and override. For
- example, %HTML.EnableAttrID will take precedence over *.id in this
- directive. You must set that directive to true before you can use
- IDs at all.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
deleted file mode 100644
index 888d55819..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-HTML.AllowedElements
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
- If HTML Purifier's tag set is unsatisfactory for your needs, you
- can overload it with your own list of tags to allow. Note that this
- method is subtractive: it does its job by taking away from HTML Purifier
- usual feature set, so you cannot add a tag that HTML Purifier never
- supported in the first place (like embed, form or head). If you
- change this, you probably also want to change %HTML.AllowedAttributes.
-</p>
-<p>
- <strong>Warning:</strong> If another directive conflicts with the
- elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
deleted file mode 100644
index 5a59a55c0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTML.AllowedModules
-TYPE: lookup/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- A doctype comes with a set of usual modules to use. Without having
- to mucking about with the doctypes, you can quickly activate or
- disable these modules by specifying which modules you wish to allow
- with this directive. This is most useful for unit testing specific
- modules, although end users may find it useful for their own ends.
-</p>
-<p>
- If you specify a module that does not exist, the manager will silently
- fail to use it, so be careful! User-defined modules are not affected
- by this directive. Modules defined in %HTML.CoreModules are not
- affected by this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
deleted file mode 100644
index 151fb7b82..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Attr.Name.UseCDATA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.0.0
---DESCRIPTION--
-The W3C specification DTD defines the name attribute to be CDATA, not ID, due
-to limitations of DTD. In certain documents, this relaxed behavior is desired,
-whether it is to specify duplicate names, or to specify names that would be
-illegal IDs (for example, names that begin with a digit.) Set this configuration
-directive to true to use the relaxed parsing rules.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
deleted file mode 100644
index 45ae469ec..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-HTML.BlockWrapper
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'p'
---DESCRIPTION--
-
-<p>
- String name of element to wrap inline elements that are inside a block
- context. This only occurs in the children of blockquote in strict mode.
-</p>
-<p>
- Example: by default value,
- <code>&lt;blockquote&gt;Foo&lt;/blockquote&gt;</code> would become
- <code>&lt;blockquote&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/blockquote&gt;</code>.
- The <code>&lt;p&gt;</code> tags can be replaced with whatever you desire,
- as long as it is a block level element.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
deleted file mode 100644
index 524618879..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-HTML.CoreModules
-TYPE: lookup
-VERSION: 2.0.0
---DEFAULT--
-array (
- 'Structure' => true,
- 'Text' => true,
- 'Hypertext' => true,
- 'List' => true,
- 'NonXMLCommonAttributes' => true,
- 'XMLCommonAttributes' => true,
- 'CommonAttributes' => true,
-)
---DESCRIPTION--
-
-<p>
- Certain modularized doctypes (XHTML, namely), have certain modules
- that must be included for the doctype to be an conforming document
- type: put those modules here. By default, XHTML's core modules
- are used. You can set this to a blank array to disable core module
- protection, but this is not recommended.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
deleted file mode 100644
index a64e3d7c3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.CustomDoctype
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-A custom doctype for power-users who defined there own document
-type. This directive only applies when %HTML.Doctype is blank.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
deleted file mode 100644
index 103db754a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-HTML.DefinitionID
-TYPE: string/null
-DEFAULT: NULL
-VERSION: 2.0.0
---DESCRIPTION--
-
-<p>
- Unique identifier for a custom-built HTML definition. If you edit
- the raw version of the HTMLDefinition, introducing changes that the
- configuration object does not reflect, you must specify this variable.
- If you change your custom edits, you should change this directive, or
- clear your cache. Example:
-</p>
-<pre>
-$config = HTMLPurifier_Config::createDefault();
-$config->set('HTML', 'DefinitionID', '1');
-$def = $config->getHTMLDefinition();
-$def->addAttribute('a', 'tabindex', 'Number');
-</pre>
-<p>
- In the above example, the configuration is still at the defaults, but
- using the advanced API, an extra attribute has been added. The
- configuration object normally has no way of knowing that this change
- has taken place, so it needs an extra directive: %HTML.DefinitionID.
- If someone else attempts to use the default configuration, these two
- pieces of code will not clobber each other in the cache, since one has
- an extra directive attached to it.
-</p>
-<p>
- You <em>must</em> specify a value to this directive to use the
- advanced API features.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
deleted file mode 100644
index 229ae0267..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-HTML.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
- Revision identifier for your custom definition specified in
- %HTML.DefinitionID. This serves the same purpose: uniquely identifying
- your custom definition, but this one does so in a chronological
- context: revision 3 is more up-to-date then revision 2. Thus, when
- this gets incremented, the cache handling is smart enough to clean
- up any older revisions of your definition as well as flush the
- cache.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
deleted file mode 100644
index 9dab497f2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Doctype
-TYPE: string/null
-DEFAULT: NULL
---DESCRIPTION--
-Doctype to use during filtering. Technically speaking this is not actually
-a doctype (as it does not identify a corresponding DTD), but we are using
-this name for sake of simplicity. When non-blank, this will override any
-older directives like %HTML.XHTML or %HTML.Strict.
---ALLOWED--
-'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
deleted file mode 100644
index 57358f9ba..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-HTML.ForbiddenAttributes
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- While this directive is similar to %HTML.AllowedAttributes, for
- forwards-compatibility with XML, this attribute has a different syntax. Instead of
- <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
- attributes in <code>a</code> tags, set this directive to
- <code>a@href</code>. You can also disallow an attribute globally with
- <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
- is provided for consistency with %HTML.AllowedAttributes).
-</p>
-<p>
- <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
- accordingly, check
- out that directive for a discussion of why you
- should think twice before using this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
deleted file mode 100644
index 93a53e14f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTML.ForbiddenElements
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
- This was, perhaps, the most requested feature ever in HTML
- Purifier. Please don't abuse it! This is the logical inverse of
- %HTML.AllowedElements, and it will override that directive, or any
- other directive.
-</p>
-<p>
- If possible, %HTML.Allowed is recommended over this directive, because it
- can sometimes be difficult to tell whether or not you've forbidden all of
- the behavior you would like to disallow. If you forbid <code>img</code>
- with the expectation of preventing images on your site, you'll be in for
- a nasty surprise when people start using the <code>background-image</code>
- CSS property.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
deleted file mode 100644
index e424c386e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.MaxImgLength
-TYPE: int/null
-DEFAULT: 1200
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This directive controls the maximum number of pixels in the width and
- height attributes in <code>img</code> tags. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %CSS.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the HTML max is an integer).
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
deleted file mode 100644
index 62e8e160c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML.Parent
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'div'
---DESCRIPTION--
-
-<p>
- String name of element that HTML fragment passed to library will be
- inserted in. An interesting variation would be using span as the
- parent element, meaning that only inline tags would be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
deleted file mode 100644
index dfb720496..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML.Proprietary
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to allow proprietary elements and attributes in your
- documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
- <strong>Warning:</strong> This can cause your documents to stop
- validating!
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
deleted file mode 100644
index f635a6854..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.SafeEmbed
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to permit embed tags in documents, with a number of extra
- security features added to prevent script execution. This is similar to
- what websites like MySpace do to embed tags. Embed is a proprietary
- element and will cause your website to stop validating. You probably want
- to enable this with %HTML.SafeObject.
- <strong>Highly experimental.</strong>
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
deleted file mode 100644
index 32967b88f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.SafeObject
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- Whether or not to permit object tags in documents, with a number of extra
- security features added to prevent script execution. This is similar to
- what websites like MySpace do to object tags. You may also want to
- enable %HTML.SafeEmbed for maximum interoperability with Internet Explorer,
- although embed tags will cause your website to stop validating.
- <strong>Highly experimental.</strong>
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
deleted file mode 100644
index a8b1de56b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.Strict
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not to use Transitional (loose) or Strict rulesets.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
deleted file mode 100644
index b4c271b7f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TidyAdd
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to add to the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
deleted file mode 100644
index 4186ccd0d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-HTML.TidyLevel
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'medium'
---DESCRIPTION--
-
-<p>General level of cleanliness the Tidy module should enforce.
-There are four allowed values:</p>
-<dl>
- <dt>none</dt>
- <dd>No extra tidying should be done</dd>
- <dt>light</dt>
- <dd>Only fix elements that would be discarded otherwise due to
- lack of support in doctype</dd>
- <dt>medium</dt>
- <dd>Enforce best practices</dd>
- <dt>heavy</dt>
- <dd>Transform all deprecated elements and attributes to standards
- compliant equivalents</dd>
-</dl>
-
---ALLOWED--
-'none', 'light', 'medium', 'heavy'
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
deleted file mode 100644
index 996762bd1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TidyRemove
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to remove from the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
deleted file mode 100644
index 89133b1a3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.Trusted
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user input is trusted or not. If the input is
-trusted, a more expansive set of allowed tags and attributes will be used.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
deleted file mode 100644
index 2a47e384f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.XHTML
-TYPE: bool
-DEFAULT: true
-VERSION: 1.1.0
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
---ALIASES--
-Core.XHTML
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
deleted file mode 100644
index 08921fde7..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Output.CommentScriptContents
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: true
---DESCRIPTION--
-Determines whether or not HTML Purifier should attempt to fix up the
-contents of script tags for legacy browsers with comments.
---ALIASES--
-Core.CommentScriptContents
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
deleted file mode 100644
index 79f8ad82c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Output.Newline
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Newline string to format final output with. If left null, HTML Purifier
- will auto-detect the default newline type of the system and use that;
- you can manually override it here. Remember, \r\n is Windows, \r
- is Mac, and \n is Unix.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
deleted file mode 100644
index 232b02362..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Output.SortAttr
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
- If true, HTML Purifier will sort attributes by name before writing them back
- to the document, converting a tag like: <code>&lt;el b="" a="" c="" /&gt;</code>
- to <code>&lt;el a="" b="" c="" /&gt;</code>. This is a workaround for
- a bug in FCKeditor which causes it to swap attributes order, adding noise
- to text diffs. If you're not seeing this bug, chances are, you don't need
- this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
deleted file mode 100644
index 06bab00a0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Output.TidyFormat
-TYPE: bool
-VERSION: 1.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- Determines whether or not to run Tidy on the final output for pretty
- formatting reasons, such as indentation and wrap.
-</p>
-<p>
- This can greatly improve readability for editors who are hand-editing
- the HTML, but is by no means necessary as HTML Purifier has already
- fixed all major errors the HTML may have had. Tidy is a non-default
- extension, and this directive will silently fail if Tidy is not
- available.
-</p>
-<p>
- If you are looking to make the overall look of your page's source
- better, I recommend running Tidy on the entire page rather than just
- user-content (after all, the indentation relative to the containing
- blocks will be incorrect).
-</p>
---ALIASES--
-Core.TidyFormat
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
deleted file mode 100644
index 071bc0295..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Test.ForceNoIconv
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
-and use only pure PHP implementations.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
deleted file mode 100644
index 98fdfe922..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-URI.AllowedSchemes
-TYPE: lookup
---DEFAULT--
-array (
- 'http' => true,
- 'https' => true,
- 'mailto' => true,
- 'ftp' => true,
- 'nntp' => true,
- 'news' => true,
-)
---DESCRIPTION--
-Whitelist that defines the schemes that a URI is allowed to have. This
-prevents XSS attacks from using pseudo-schemes like javascript or mocha.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
deleted file mode 100644
index 876f0680c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-URI.Base
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- The base URI is the URI of the document this purified HTML will be
- inserted into. This information is important if HTML Purifier needs
- to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
- is on. You may use a non-absolute URI for this value, but behavior
- may vary (%URI.MakeAbsolute deals nicely with both absolute and
- relative paths, but forwards-compatibility is not guaranteed).
- <strong>Warning:</strong> If set, the scheme on this URI
- overrides the one specified by %URI.DefaultScheme.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
deleted file mode 100644
index 728e378cb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-URI.DefaultScheme
-TYPE: string
-DEFAULT: 'http'
---DESCRIPTION--
-
-<p>
- Defines through what scheme the output will be served, in order to
- select the proper object validator when no scheme information is present.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
deleted file mode 100644
index f05312ba8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DefinitionID
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Unique identifier for a custom-built URI definition. If you want
- to add custom URIFilters, you must specify this value.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
deleted file mode 100644
index 80cfea93f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DefinitionRev
-TYPE: int
-VERSION: 2.1.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
- Revision identifier for your custom definition. See
- %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
deleted file mode 100644
index 71ce025a2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-URI.Disable
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Disables all URIs in all forms. Not sure why you'd want to do that
- (after all, the Internet's founded on the notion of a hyperlink).
-</p>
-
---ALIASES--
-Attr.DisableURI
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
deleted file mode 100644
index 13c122c8c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DisableExternal
-TYPE: bool
-VERSION: 1.2.0
-DEFAULT: false
---DESCRIPTION--
-Disables links to external websites. This is a highly effective anti-spam
-and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
-images outside of your domain will be allowed. Non-linkified URIs will
-still be preserved. If you want to be able to link to subdomains or use
-absolute URIs, specify %URI.Host for your website.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
deleted file mode 100644
index abcc1efd6..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-URI.DisableExternalResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-Disables the embedding of external resources, preventing users from
-embedding things like images from other hosts. This prevents access
-tracking (good for email viewers), bandwidth leeching, cross-site request
-forging, goatse.cx posting, and other nasties, but also results in a loss
-of end-user functionality (they can't directly post a pic they posted from
-Flickr anymore). Use it if you don't have a robust user-content moderation
-team.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
deleted file mode 100644
index 51e6ea91f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-URI.DisableResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Disables embedding resources, essentially meaning no pictures. You can
- still link to them though. See %URI.DisableExternalResources for why
- this might be a good idea.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
deleted file mode 100644
index ee83b121d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-URI.Host
-TYPE: string/null
-VERSION: 1.2.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Defines the domain name of the server, so we can determine whether or
- an absolute URI is from your website or not. Not strictly necessary,
- as users should be using relative URIs to reference resources on your
- website. It will, however, let you use absolute URIs to link to
- subdomains of the domain you post here: i.e. example.com will allow
- sub.example.com. However, higher up domains will still be excluded:
- if you set %URI.Host to sub.example.com, example.com will be blocked.
- <strong>Note:</strong> This directive overrides %URI.Base because
- a given page may be on a sub-domain, but you wish HTML Purifier to be
- more relaxed and allow some of the parent domains too.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
deleted file mode 100644
index 0b6df7625..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-URI.HostBlacklist
-TYPE: list
-VERSION: 1.3.0
-DEFAULT: array()
---DESCRIPTION--
-List of strings that are forbidden in the host of any URI. Use it to kill
-domain names of spam, etc. Note that it will catch anything in the domain,
-so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
deleted file mode 100644
index 4214900a5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-URI.MakeAbsolute
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
- Converts all URIs into absolute forms. This is useful when the HTML
- being filtered assumes a specific base path, but will actually be
- viewed in a different context (and setting an alternate base URI is
- not possible). %URI.Base must be set for this directive to work.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
deleted file mode 100644
index 58c81dcc4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-URI.Munge
-TYPE: string/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
- Munges all browsable (usually http, https and ftp)
- absolute URIs into another URI, usually a URI redirection service.
- This directive accepts a URI, formatted with a <code>%s</code> where
- the url-encoded original URI should be inserted (sample:
- <code>http://www.google.com/url?q=%s</code>).
-</p>
-<p>
- Uses for this directive:
-</p>
-<ul>
- <li>
- Prevent PageRank leaks, while being fairly transparent
- to users (you may also want to add some client side JavaScript to
- override the text in the statusbar). <strong>Notice</strong>:
- Many security experts believe that this form of protection does not deter spam-bots.
- </li>
- <li>
- Redirect users to a splash page telling them they are leaving your
- website. While this is poor usability practice, it is often mandated
- in corporate environments.
- </li>
-</ul>
-<p>
- Prior to HTML Purifier 3.1.1, this directive also enabled the munging
- of browsable external resources, which could break things if your redirection
- script was a splash page or used <code>meta</code> tags. To revert to
- previous behavior, please use %URI.MungeResources.
-</p>
-<p>
- You may want to also use %URI.MungeSecretKey along with this directive
- in order to enforce what URIs your redirector script allows. Open
- redirector scripts can be a security risk and negatively affect the
- reputation of your domain name.
-</p>
-<p>
- Starting with HTML Purifier 3.1.1, there is also these substitutions:
-</p>
-<table>
- <thead>
- <tr>
- <th>Key</th>
- <th>Description</th>
- <th>Example <code>&lt;a href=""&gt;</code></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>%r</td>
- <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
- <td></td>
- </tr>
- <tr>
- <td>%n</td>
- <td>The name of the tag this URI came from</td>
- <td>a</td>
- </tr>
- <tr>
- <td>%m</td>
- <td>The name of the attribute this URI came from</td>
- <td>href</td>
- </tr>
- <tr>
- <td>%p</td>
- <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
- <td></td>
- </tr>
- </tbody>
-</table>
-<p>
- Admittedly, these letters are somewhat arbitrary; the only stipulation
- was that they couldn't be a through f. r is for resource (I would have preferred
- e, but you take what you can get), n is for name, m
- was picked because it came after n (and I couldn't use a), p is for
- property.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
deleted file mode 100644
index 6fce0fdc3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-URI.MungeResources
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
- If true, any URI munging directives like %URI.Munge
- will also apply to embedded resources, such as <code>&lt;img src=""&gt;</code>.
- Be careful enabling this directive if you have a redirector script
- that does not use the <code>Location</code> HTTP header; all of your images
- and other embedded resources will break.
-</p>
-<p>
- <strong>Warning:</strong> It is strongly advised you use this in conjunction
- %URI.MungeSecretKey to mitigate the security risk of an open redirector.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
deleted file mode 100644
index 0d00f62ea..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-URI.MungeSecretKey
-TYPE: string/null
-VERSION: 3.1.1
-DEFAULT: NULL
---DESCRIPTION--
-<p>
- This directive enables secure checksum generation along with %URI.Munge.
- It should be set to a secure key that is not shared with anyone else.
- The checksum can be placed in the URI using %t. Use of this checksum
- affords an additional level of protection by allowing a redirector
- to check if a URI has passed through HTML Purifier with this line:
-</p>
-
-<pre>$checksum === sha1($secret_key . ':' . $url)</pre>
-
-<p>
- If the output is TRUE, the redirector script should accept the URI.
-</p>
-
-<p>
- Please note that it would still be possible for an attacker to procure
- secure hashes en-mass by abusing your website's Preview feature or the
- like, but this service affords an additional level of protection
- that should be combined with website blacklisting.
-</p>
-
-<p>
- Remember this has no effect if %URI.Munge is not on.
-</p>
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
deleted file mode 100644
index 23331a4e7..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-URI.OverrideAllowedSchemes
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-If this is set to true (which it is by default), you can override
-%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
-registry. If false, you will also have to update that directive in order
-to add more schemes.
---# vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
deleted file mode 100644
index 5de4505e1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-name = "HTML Purifier"
-
-; vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ContentSets.php b/extlib/HTMLPurifier/HTMLPurifier/ContentSets.php
deleted file mode 100644
index 3b6e96f5f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ContentSets.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * @todo Unit test
- */
-class HTMLPurifier_ContentSets
-{
-
- /**
- * List of content set strings (pipe seperators) indexed by name.
- */
- public $info = array();
-
- /**
- * List of content set lookups (element => true) indexed by name.
- * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
- */
- public $lookup = array();
-
- /**
- * Synchronized list of defined content sets (keys of info)
- */
- protected $keys = array();
- /**
- * Synchronized list of defined content values (values of info)
- */
- protected $values = array();
-
- /**
- * Merges in module's content sets, expands identifiers in the content
- * sets and populates the keys, values and lookup member variables.
- * @param $modules List of HTMLPurifier_HTMLModule
- */
- public function __construct($modules) {
- if (!is_array($modules)) $modules = array($modules);
- // populate content_sets based on module hints
- // sorry, no way of overloading
- foreach ($modules as $module_i => $module) {
- foreach ($module->content_sets as $key => $value) {
- $temp = $this->convertToLookup($value);
- if (isset($this->lookup[$key])) {
- // add it into the existing content set
- $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
- } else {
- $this->lookup[$key] = $temp;
- }
- }
- }
- $old_lookup = false;
- while ($old_lookup !== $this->lookup) {
- $old_lookup = $this->lookup;
- foreach ($this->lookup as $i => $set) {
- $add = array();
- foreach ($set as $element => $x) {
- if (isset($this->lookup[$element])) {
- $add += $this->lookup[$element];
- unset($this->lookup[$i][$element]);
- }
- }
- $this->lookup[$i] += $add;
- }
- }
-
- foreach ($this->lookup as $key => $lookup) {
- $this->info[$key] = implode(' | ', array_keys($lookup));
- }
- $this->keys = array_keys($this->info);
- $this->values = array_values($this->info);
- }
-
- /**
- * Accepts a definition; generates and assigns a ChildDef for it
- * @param $def HTMLPurifier_ElementDef reference
- * @param $module Module that defined the ElementDef
- */
- public function generateChildDef(&$def, $module) {
- if (!empty($def->child)) return; // already done!
- $content_model = $def->content_model;
- if (is_string($content_model)) {
- // Assume that $this->keys is alphanumeric
- $def->content_model = preg_replace_callback(
- '/\b(' . implode('|', $this->keys) . ')\b/',
- array($this, 'generateChildDefCallback'),
- $content_model
- );
- //$def->content_model = str_replace(
- // $this->keys, $this->values, $content_model);
- }
- $def->child = $this->getChildDef($def, $module);
- }
-
- public function generateChildDefCallback($matches) {
- return $this->info[$matches[0]];
- }
-
- /**
- * Instantiates a ChildDef based on content_model and content_model_type
- * member variables in HTMLPurifier_ElementDef
- * @note This will also defer to modules for custom HTMLPurifier_ChildDef
- * subclasses that need content set expansion
- * @param $def HTMLPurifier_ElementDef to have ChildDef extracted
- * @return HTMLPurifier_ChildDef corresponding to ElementDef
- */
- public function getChildDef($def, $module) {
- $value = $def->content_model;
- if (is_object($value)) {
- trigger_error(
- 'Literal object child definitions should be stored in '.
- 'ElementDef->child not ElementDef->content_model',
- E_USER_NOTICE
- );
- return $value;
- }
- switch ($def->content_model_type) {
- case 'required':
- return new HTMLPurifier_ChildDef_Required($value);
- case 'optional':
- return new HTMLPurifier_ChildDef_Optional($value);
- case 'empty':
- return new HTMLPurifier_ChildDef_Empty();
- case 'custom':
- return new HTMLPurifier_ChildDef_Custom($value);
- }
- // defer to its module
- $return = false;
- if ($module->defines_child_def) { // save a func call
- $return = $module->getChildDef($def);
- }
- if ($return !== false) return $return;
- // error-out
- trigger_error(
- 'Could not determine which ChildDef class to instantiate',
- E_USER_ERROR
- );
- return false;
- }
-
- /**
- * Converts a string list of elements separated by pipes into
- * a lookup array.
- * @param $string List of elements
- * @return Lookup array of elements
- */
- protected function convertToLookup($string) {
- $array = explode('|', str_replace(' ', '', $string));
- $ret = array();
- foreach ($array as $i => $k) {
- $ret[$k] = true;
- }
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Context.php b/extlib/HTMLPurifier/HTMLPurifier/Context.php
deleted file mode 100644
index 9ddf0c547..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Context.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Registry object that contains information about the current context.
- * @warning Is a bit buggy when variables are set to null: it thinks
- * they don't exist! So use false instead, please.
- * @note Since the variables Context deals with may not be objects,
- * references are very important here! Do not remove!
- */
-class HTMLPurifier_Context
-{
-
- /**
- * Private array that stores the references.
- */
- private $_storage = array();
-
- /**
- * Registers a variable into the context.
- * @param $name String name
- * @param $ref Reference to variable to be registered
- */
- public function register($name, &$ref) {
- if (isset($this->_storage[$name])) {
- trigger_error("Name $name produces collision, cannot re-register",
- E_USER_ERROR);
- return;
- }
- $this->_storage[$name] =& $ref;
- }
-
- /**
- * Retrieves a variable reference from the context.
- * @param $name String name
- * @param $ignore_error Boolean whether or not to ignore error
- */
- public function &get($name, $ignore_error = false) {
- if (!isset($this->_storage[$name])) {
- if (!$ignore_error) {
- trigger_error("Attempted to retrieve non-existent variable $name",
- E_USER_ERROR);
- }
- $var = null; // so we can return by reference
- return $var;
- }
- return $this->_storage[$name];
- }
-
- /**
- * Destorys a variable in the context.
- * @param $name String name
- */
- public function destroy($name) {
- if (!isset($this->_storage[$name])) {
- trigger_error("Attempted to destroy non-existent variable $name",
- E_USER_ERROR);
- return;
- }
- unset($this->_storage[$name]);
- }
-
- /**
- * Checks whether or not the variable exists.
- * @param $name String name
- */
- public function exists($name) {
- return isset($this->_storage[$name]);
- }
-
- /**
- * Loads a series of variables from an associative array
- * @param $context_array Assoc array of variables to load
- */
- public function loadArray($context_array) {
- foreach ($context_array as $key => $discard) {
- $this->register($key, $context_array[$key]);
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Definition.php b/extlib/HTMLPurifier/HTMLPurifier/Definition.php
deleted file mode 100644
index a7408c974..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Definition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Super-class for definition datatype objects, implements serialization
- * functions for the class.
- */
-abstract class HTMLPurifier_Definition
-{
-
- /**
- * Has setup() been called yet?
- */
- public $setup = false;
-
- /**
- * What type of definition is it?
- */
- public $type;
-
- /**
- * Sets up the definition object into the final form, something
- * not done by the constructor
- * @param $config HTMLPurifier_Config instance
- */
- abstract protected function doSetup($config);
-
- /**
- * Setup function that aborts if already setup
- * @param $config HTMLPurifier_Config instance
- */
- public function setup($config) {
- if ($this->setup) return;
- $this->setup = true;
- $this->doSetup($config);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache.php
deleted file mode 100644
index c6e1e388c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * Abstract class representing Definition cache managers that implements
- * useful common methods and is a factory.
- * @todo Create a separate maintenance file advanced users can use to
- * cache their custom HTMLDefinition, which can be loaded
- * via a configuration directive
- * @todo Implement memcached
- */
-abstract class HTMLPurifier_DefinitionCache
-{
-
- public $type;
-
- /**
- * @param $name Type of definition objects this instance of the
- * cache will handle.
- */
- public function __construct($type) {
- $this->type = $type;
- }
-
- /**
- * Generates a unique identifier for a particular configuration
- * @param Instance of HTMLPurifier_Config
- */
- public function generateKey($config) {
- return $config->version . ',' . // possibly replace with function calls
- $config->getBatchSerial($this->type) . ',' .
- $config->get($this->type . '.DefinitionRev');
- }
-
- /**
- * Tests whether or not a key is old with respect to the configuration's
- * version and revision number.
- * @param $key Key to test
- * @param $config Instance of HTMLPurifier_Config to test against
- */
- public function isOld($key, $config) {
- if (substr_count($key, ',') < 2) return true;
- list($version, $hash, $revision) = explode(',', $key, 3);
- $compare = version_compare($version, $config->version);
- // version mismatch, is always old
- if ($compare != 0) return true;
- // versions match, ids match, check revision number
- if (
- $hash == $config->getBatchSerial($this->type) &&
- $revision < $config->get($this->type . '.DefinitionRev')
- ) return true;
- return false;
- }
-
- /**
- * Checks if a definition's type jives with the cache's type
- * @note Throws an error on failure
- * @param $def Definition object to check
- * @return Boolean true if good, false if not
- */
- public function checkDefType($def) {
- if ($def->type !== $this->type) {
- trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
- return false;
- }
- return true;
- }
-
- /**
- * Adds a definition object to the cache
- */
- abstract public function add($def, $config);
-
- /**
- * Unconditionally saves a definition object to the cache
- */
- abstract public function set($def, $config);
-
- /**
- * Replace an object in the cache
- */
- abstract public function replace($def, $config);
-
- /**
- * Retrieves a definition object from the cache
- */
- abstract public function get($config);
-
- /**
- * Removes a definition object to the cache
- */
- abstract public function remove($config);
-
- /**
- * Clears all objects from cache
- */
- abstract public function flush($config);
-
- /**
- * Clears all expired (older version or revision) objects from cache
- * @note Be carefuly implementing this method as flush. Flush must
- * not interfere with other Definition types, and cleanup()
- * should not be repeatedly called by userland code.
- */
- abstract public function cleanup($config);
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
deleted file mode 100644
index b0fb6d0cd..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
-{
-
- /**
- * Cache object we are decorating
- */
- public $cache;
-
- public function __construct() {}
-
- /**
- * Lazy decorator function
- * @param $cache Reference to cache object to decorate
- */
- public function decorate(&$cache) {
- $decorator = $this->copy();
- // reference is necessary for mocks in PHP 4
- $decorator->cache =& $cache;
- $decorator->type = $cache->type;
- return $decorator;
- }
-
- /**
- * Cross-compatible clone substitute
- */
- public function copy() {
- return new HTMLPurifier_DefinitionCache_Decorator();
- }
-
- public function add($def, $config) {
- return $this->cache->add($def, $config);
- }
-
- public function set($def, $config) {
- return $this->cache->set($def, $config);
- }
-
- public function replace($def, $config) {
- return $this->cache->replace($def, $config);
- }
-
- public function get($config) {
- return $this->cache->get($config);
- }
-
- public function remove($config) {
- return $this->cache->remove($config);
- }
-
- public function flush($config) {
- return $this->cache->flush($config);
- }
-
- public function cleanup($config) {
- return $this->cache->cleanup($config);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
deleted file mode 100644
index d4cc35c4b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Definition cache decorator class that cleans up the cache
- * whenever there is a cache miss.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
- HTMLPurifier_DefinitionCache_Decorator
-{
-
- public $name = 'Cleanup';
-
- public function copy() {
- return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
- }
-
- public function add($def, $config) {
- $status = parent::add($def, $config);
- if (!$status) parent::cleanup($config);
- return $status;
- }
-
- public function set($def, $config) {
- $status = parent::set($def, $config);
- if (!$status) parent::cleanup($config);
- return $status;
- }
-
- public function replace($def, $config) {
- $status = parent::replace($def, $config);
- if (!$status) parent::cleanup($config);
- return $status;
- }
-
- public function get($config) {
- $ret = parent::get($config);
- if (!$ret) parent::cleanup($config);
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
deleted file mode 100644
index 18f16d32b..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Definition cache decorator class that saves all cache retrievals
- * to PHP's memory; good for unit tests or circumstances where
- * there are lots of configuration objects floating around.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Memory extends
- HTMLPurifier_DefinitionCache_Decorator
-{
-
- protected $definitions;
- public $name = 'Memory';
-
- public function copy() {
- return new HTMLPurifier_DefinitionCache_Decorator_Memory();
- }
-
- public function add($def, $config) {
- $status = parent::add($def, $config);
- if ($status) $this->definitions[$this->generateKey($config)] = $def;
- return $status;
- }
-
- public function set($def, $config) {
- $status = parent::set($def, $config);
- if ($status) $this->definitions[$this->generateKey($config)] = $def;
- return $status;
- }
-
- public function replace($def, $config) {
- $status = parent::replace($def, $config);
- if ($status) $this->definitions[$this->generateKey($config)] = $def;
- return $status;
- }
-
- public function get($config) {
- $key = $this->generateKey($config);
- if (isset($this->definitions[$key])) return $this->definitions[$key];
- $this->definitions[$key] = parent::get($config);
- return $this->definitions[$key];
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
deleted file mode 100644
index 21a8fcfda..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
-
-/**
- * Definition cache decorator template.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Template extends
- HTMLPurifier_DefinitionCache_Decorator
-{
-
- var $name = 'Template'; // replace this
-
- function copy() {
- // replace class name with yours
- return new HTMLPurifier_DefinitionCache_Decorator_Template();
- }
-
- // remove methods you don't need
-
- function add($def, $config) {
- return parent::add($def, $config);
- }
-
- function set($def, $config) {
- return parent::set($def, $config);
- }
-
- function replace($def, $config) {
- return parent::replace($def, $config);
- }
-
- function get($config) {
- return parent::get($config);
- }
-
- function flush() {
- return parent::flush();
- }
-
- function cleanup($config) {
- return parent::cleanup($config);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
deleted file mode 100644
index 41d97e734..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Null cache object to use when no caching is on.
- */
-class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
-{
-
- public function add($def, $config) {
- return false;
- }
-
- public function set($def, $config) {
- return false;
- }
-
- public function replace($def, $config) {
- return false;
- }
-
- public function remove($config) {
- return false;
- }
-
- public function get($config) {
- return false;
- }
-
- public function flush($config) {
- return false;
- }
-
- public function cleanup($config) {
- return false;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
deleted file mode 100644
index 7a6aa93f0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Serializer extends
- HTMLPurifier_DefinitionCache
-{
-
- public function add($def, $config) {
- if (!$this->checkDefType($def)) return;
- $file = $this->generateFilePath($config);
- if (file_exists($file)) return false;
- if (!$this->_prepareDir($config)) return false;
- return $this->_write($file, serialize($def));
- }
-
- public function set($def, $config) {
- if (!$this->checkDefType($def)) return;
- $file = $this->generateFilePath($config);
- if (!$this->_prepareDir($config)) return false;
- return $this->_write($file, serialize($def));
- }
-
- public function replace($def, $config) {
- if (!$this->checkDefType($def)) return;
- $file = $this->generateFilePath($config);
- if (!file_exists($file)) return false;
- if (!$this->_prepareDir($config)) return false;
- return $this->_write($file, serialize($def));
- }
-
- public function get($config) {
- $file = $this->generateFilePath($config);
- if (!file_exists($file)) return false;
- return unserialize(file_get_contents($file));
- }
-
- public function remove($config) {
- $file = $this->generateFilePath($config);
- if (!file_exists($file)) return false;
- return unlink($file);
- }
-
- public function flush($config) {
- if (!$this->_prepareDir($config)) return false;
- $dir = $this->generateDirectoryPath($config);
- $dh = opendir($dir);
- while (false !== ($filename = readdir($dh))) {
- if (empty($filename)) continue;
- if ($filename[0] === '.') continue;
- unlink($dir . '/' . $filename);
- }
- }
-
- public function cleanup($config) {
- if (!$this->_prepareDir($config)) return false;
- $dir = $this->generateDirectoryPath($config);
- $dh = opendir($dir);
- while (false !== ($filename = readdir($dh))) {
- if (empty($filename)) continue;
- if ($filename[0] === '.') continue;
- $key = substr($filename, 0, strlen($filename) - 4);
- if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
- }
- }
-
- /**
- * Generates the file path to the serial file corresponding to
- * the configuration and definition name
- * @todo Make protected
- */
- public function generateFilePath($config) {
- $key = $this->generateKey($config);
- return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
- }
-
- /**
- * Generates the path to the directory contain this cache's serial files
- * @note No trailing slash
- * @todo Make protected
- */
- public function generateDirectoryPath($config) {
- $base = $this->generateBaseDirectoryPath($config);
- return $base . '/' . $this->type;
- }
-
- /**
- * Generates path to base directory that contains all definition type
- * serials
- * @todo Make protected
- */
- public function generateBaseDirectoryPath($config) {
- $base = $config->get('Cache.SerializerPath');
- $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
- return $base;
- }
-
- /**
- * Convenience wrapper function for file_put_contents
- * @param $file File name to write to
- * @param $data Data to write into file
- * @return Number of bytes written if success, or false if failure.
- */
- private function _write($file, $data) {
- return file_put_contents($file, $data);
- }
-
- /**
- * Prepares the directory that this type stores the serials in
- * @return True if successful
- */
- private function _prepareDir($config) {
- $directory = $this->generateDirectoryPath($config);
- if (!is_dir($directory)) {
- $base = $this->generateBaseDirectoryPath($config);
- if (!is_dir($base)) {
- trigger_error('Base directory '.$base.' does not exist,
- please create or change using %Cache.SerializerPath',
- E_USER_WARNING);
- return false;
- } elseif (!$this->_testPermissions($base)) {
- return false;
- }
- $old = umask(0022); // disable group and world writes
- mkdir($directory);
- umask($old);
- } elseif (!$this->_testPermissions($directory)) {
- return false;
- }
- return true;
- }
-
- /**
- * Tests permissions on a directory and throws out friendly
- * error messages and attempts to chmod it itself if possible
- */
- private function _testPermissions($dir) {
- // early abort, if it is writable, everything is hunky-dory
- if (is_writable($dir)) return true;
- if (!is_dir($dir)) {
- // generally, you'll want to handle this beforehand
- // so a more specific error message can be given
- trigger_error('Directory '.$dir.' does not exist',
- E_USER_WARNING);
- return false;
- }
- if (function_exists('posix_getuid')) {
- // POSIX system, we can give more specific advice
- if (fileowner($dir) === posix_getuid()) {
- // we can chmod it ourselves
- chmod($dir, 0755);
- return true;
- } elseif (filegroup($dir) === posix_getgid()) {
- $chmod = '775';
- } else {
- // PHP's probably running as nobody, so we'll
- // need to give global permissions
- $chmod = '777';
- }
- trigger_error('Directory '.$dir.' not writable, '.
- 'please chmod to ' . $chmod,
- E_USER_WARNING);
- } else {
- // generic error message
- trigger_error('Directory '.$dir.' not writable, '.
- 'please alter file permissions',
- E_USER_WARNING);
- }
- return false;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
deleted file mode 100755
index 2e35c1c3d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a dummy file to prevent Git from ignoring this empty directory.
-
- vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php b/extlib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
deleted file mode 100644
index a6ead6281..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Responsible for creating definition caches.
- */
-class HTMLPurifier_DefinitionCacheFactory
-{
-
- protected $caches = array('Serializer' => array());
- protected $implementations = array();
- protected $decorators = array();
-
- /**
- * Initialize default decorators
- */
- public function setup() {
- $this->addDecorator('Cleanup');
- }
-
- /**
- * Retrieves an instance of global definition cache factory.
- */
- public static function instance($prototype = null) {
- static $instance;
- if ($prototype !== null) {
- $instance = $prototype;
- } elseif ($instance === null || $prototype === true) {
- $instance = new HTMLPurifier_DefinitionCacheFactory();
- $instance->setup();
- }
- return $instance;
- }
-
- /**
- * Registers a new definition cache object
- * @param $short Short name of cache object, for reference
- * @param $long Full class name of cache object, for construction
- */
- public function register($short, $long) {
- $this->implementations[$short] = $long;
- }
-
- /**
- * Factory method that creates a cache object based on configuration
- * @param $name Name of definitions handled by cache
- * @param $config Instance of HTMLPurifier_Config
- */
- public function create($type, $config) {
- $method = $config->get('Cache.DefinitionImpl');
- if ($method === null) {
- return new HTMLPurifier_DefinitionCache_Null($type);
- }
- if (!empty($this->caches[$method][$type])) {
- return $this->caches[$method][$type];
- }
- if (
- isset($this->implementations[$method]) &&
- class_exists($class = $this->implementations[$method], false)
- ) {
- $cache = new $class($type);
- } else {
- if ($method != 'Serializer') {
- trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
- }
- $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
- }
- foreach ($this->decorators as $decorator) {
- $new_cache = $decorator->decorate($cache);
- // prevent infinite recursion in PHP 4
- unset($cache);
- $cache = $new_cache;
- }
- $this->caches[$method][$type] = $cache;
- return $this->caches[$method][$type];
- }
-
- /**
- * Registers a decorator to add to all new cache objects
- * @param
- */
- public function addDecorator($decorator) {
- if (is_string($decorator)) {
- $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
- $decorator = new $class;
- }
- $this->decorators[$decorator->name] = $decorator;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Doctype.php b/extlib/HTMLPurifier/HTMLPurifier/Doctype.php
deleted file mode 100644
index 1e3c574c0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Doctype.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Represents a document type, contains information on which modules
- * need to be loaded.
- * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
- * If structure changes, please update that function.
- */
-class HTMLPurifier_Doctype
-{
- /**
- * Full name of doctype
- */
- public $name;
-
- /**
- * List of standard modules (string identifiers or literal objects)
- * that this doctype uses
- */
- public $modules = array();
-
- /**
- * List of modules to use for tidying up code
- */
- public $tidyModules = array();
-
- /**
- * Is the language derived from XML (i.e. XHTML)?
- */
- public $xml = true;
-
- /**
- * List of aliases for this doctype
- */
- public $aliases = array();
-
- /**
- * Public DTD identifier
- */
- public $dtdPublic;
-
- /**
- * System DTD identifier
- */
- public $dtdSystem;
-
- public function __construct($name = null, $xml = true, $modules = array(),
- $tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
- ) {
- $this->name = $name;
- $this->xml = $xml;
- $this->modules = $modules;
- $this->tidyModules = $tidyModules;
- $this->aliases = $aliases;
- $this->dtdPublic = $dtd_public;
- $this->dtdSystem = $dtd_system;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php b/extlib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
deleted file mode 100644
index 86049e939..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-class HTMLPurifier_DoctypeRegistry
-{
-
- /**
- * Hash of doctype names to doctype objects
- */
- protected $doctypes;
-
- /**
- * Lookup table of aliases to real doctype names
- */
- protected $aliases;
-
- /**
- * Registers a doctype to the registry
- * @note Accepts a fully-formed doctype object, or the
- * parameters for constructing a doctype object
- * @param $doctype Name of doctype or literal doctype object
- * @param $modules Modules doctype will load
- * @param $modules_for_modes Modules doctype will load for certain modes
- * @param $aliases Alias names for doctype
- * @return Editable registered doctype
- */
- public function register($doctype, $xml = true, $modules = array(),
- $tidy_modules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
- ) {
- if (!is_array($modules)) $modules = array($modules);
- if (!is_array($tidy_modules)) $tidy_modules = array($tidy_modules);
- if (!is_array($aliases)) $aliases = array($aliases);
- if (!is_object($doctype)) {
- $doctype = new HTMLPurifier_Doctype(
- $doctype, $xml, $modules, $tidy_modules, $aliases, $dtd_public, $dtd_system
- );
- }
- $this->doctypes[$doctype->name] = $doctype;
- $name = $doctype->name;
- // hookup aliases
- foreach ($doctype->aliases as $alias) {
- if (isset($this->doctypes[$alias])) continue;
- $this->aliases[$alias] = $name;
- }
- // remove old aliases
- if (isset($this->aliases[$name])) unset($this->aliases[$name]);
- return $doctype;
- }
-
- /**
- * Retrieves reference to a doctype of a certain name
- * @note This function resolves aliases
- * @note When possible, use the more fully-featured make()
- * @param $doctype Name of doctype
- * @return Editable doctype object
- */
- public function get($doctype) {
- if (isset($this->aliases[$doctype])) $doctype = $this->aliases[$doctype];
- if (!isset($this->doctypes[$doctype])) {
- trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
- $anon = new HTMLPurifier_Doctype($doctype);
- return $anon;
- }
- return $this->doctypes[$doctype];
- }
-
- /**
- * Creates a doctype based on a configuration object,
- * will perform initialization on the doctype
- * @note Use this function to get a copy of doctype that config
- * can hold on to (this is necessary in order to tell
- * Generator whether or not the current document is XML
- * based or not).
- */
- public function make($config) {
- return clone $this->get($this->getDoctypeFromConfig($config));
- }
-
- /**
- * Retrieves the doctype from the configuration object
- */
- public function getDoctypeFromConfig($config) {
- // recommended test
- $doctype = $config->get('HTML.Doctype');
- if (!empty($doctype)) return $doctype;
- $doctype = $config->get('HTML.CustomDoctype');
- if (!empty($doctype)) return $doctype;
- // backwards-compatibility
- if ($config->get('HTML.XHTML')) {
- $doctype = 'XHTML 1.0';
- } else {
- $doctype = 'HTML 4.01';
- }
- if ($config->get('HTML.Strict')) {
- $doctype .= ' Strict';
- } else {
- $doctype .= ' Transitional';
- }
- return $doctype;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ElementDef.php b/extlib/HTMLPurifier/HTMLPurifier/ElementDef.php
deleted file mode 100644
index aede2c3bb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ElementDef.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * Structure that stores an HTML element definition. Used by
- * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
- * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
- * Please update that class too.
- * @warning If you add new properties to this class, you MUST update
- * the mergeIn() method.
- */
-class HTMLPurifier_ElementDef
-{
-
- /**
- * Does the definition work by itself, or is it created solely
- * for the purpose of merging into another definition?
- */
- public $standalone = true;
-
- /**
- * Associative array of attribute name to HTMLPurifier_AttrDef
- * @note Before being processed by HTMLPurifier_AttrCollections
- * when modules are finalized during
- * HTMLPurifier_HTMLDefinition->setup(), this array may also
- * contain an array at index 0 that indicates which attribute
- * collections to load into the full array. It may also
- * contain string indentifiers in lieu of HTMLPurifier_AttrDef,
- * see HTMLPurifier_AttrTypes on how they are expanded during
- * HTMLPurifier_HTMLDefinition->setup() processing.
- */
- public $attr = array();
-
- /**
- * Indexed list of tag's HTMLPurifier_AttrTransform to be done before validation
- */
- public $attr_transform_pre = array();
-
- /**
- * Indexed list of tag's HTMLPurifier_AttrTransform to be done after validation
- */
- public $attr_transform_post = array();
-
- /**
- * HTMLPurifier_ChildDef of this tag.
- */
- public $child;
-
- /**
- * Abstract string representation of internal ChildDef rules. See
- * HTMLPurifier_ContentSets for how this is parsed and then transformed
- * into an HTMLPurifier_ChildDef.
- * @warning This is a temporary variable that is not available after
- * being processed by HTMLDefinition
- */
- public $content_model;
-
- /**
- * Value of $child->type, used to determine which ChildDef to use,
- * used in combination with $content_model.
- * @warning This must be lowercase
- * @warning This is a temporary variable that is not available after
- * being processed by HTMLDefinition
- */
- public $content_model_type;
-
-
-
- /**
- * Does the element have a content model (#PCDATA | Inline)*? This
- * is important for chameleon ins and del processing in
- * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
- * have to worry about this one.
- */
- public $descendants_are_inline = false;
-
- /**
- * List of the names of required attributes this element has. Dynamically
- * populated by HTMLPurifier_HTMLDefinition::getElement
- */
- public $required_attr = array();
-
- /**
- * Lookup table of tags excluded from all descendants of this tag.
- * @note SGML permits exclusions for all descendants, but this is
- * not possible with DTDs or XML Schemas. W3C has elected to
- * use complicated compositions of content_models to simulate
- * exclusion for children, but we go the simpler, SGML-style
- * route of flat-out exclusions, which correctly apply to
- * all descendants and not just children. Note that the XHTML
- * Modularization Abstract Modules are blithely unaware of such
- * distinctions.
- */
- public $excludes = array();
-
- /**
- * This tag is explicitly auto-closed by the following tags.
- */
- public $autoclose = array();
-
- /**
- * Whether or not this is a formatting element affected by the
- * "Active Formatting Elements" algorithm.
- */
- public $formatting;
-
- /**
- * Low-level factory constructor for creating new standalone element defs
- */
- public static function create($content_model, $content_model_type, $attr) {
- $def = new HTMLPurifier_ElementDef();
- $def->content_model = $content_model;
- $def->content_model_type = $content_model_type;
- $def->attr = $attr;
- return $def;
- }
-
- /**
- * Merges the values of another element definition into this one.
- * Values from the new element def take precedence if a value is
- * not mergeable.
- */
- public function mergeIn($def) {
-
- // later keys takes precedence
- foreach($def->attr as $k => $v) {
- if ($k === 0) {
- // merge in the includes
- // sorry, no way to override an include
- foreach ($v as $v2) {
- $this->attr[0][] = $v2;
- }
- continue;
- }
- if ($v === false) {
- if (isset($this->attr[$k])) unset($this->attr[$k]);
- continue;
- }
- $this->attr[$k] = $v;
- }
- $this->_mergeAssocArray($this->attr_transform_pre, $def->attr_transform_pre);
- $this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
- $this->_mergeAssocArray($this->excludes, $def->excludes);
-
- if(!empty($def->content_model)) {
- $this->content_model =
- str_replace("#SUPER", $this->content_model, $def->content_model);
- $this->child = false;
- }
- if(!empty($def->content_model_type)) {
- $this->content_model_type = $def->content_model_type;
- $this->child = false;
- }
- if(!is_null($def->child)) $this->child = $def->child;
- if(!is_null($def->formatting)) $this->formatting = $def->formatting;
- if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
-
- }
-
- /**
- * Merges one array into another, removes values which equal false
- * @param $a1 Array by reference that is merged into
- * @param $a2 Array that merges into $a1
- */
- private function _mergeAssocArray(&$a1, $a2) {
- foreach ($a2 as $k => $v) {
- if ($v === false) {
- if (isset($a1[$k])) unset($a1[$k]);
- continue;
- }
- $a1[$k] = $v;
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Encoder.php b/extlib/HTMLPurifier/HTMLPurifier/Encoder.php
deleted file mode 100644
index 2b3140caa..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Encoder.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-
-/**
- * A UTF-8 specific character encoder that handles cleaning and transforming.
- * @note All functions in this class should be static.
- */
-class HTMLPurifier_Encoder
-{
-
- /**
- * Constructor throws fatal error if you attempt to instantiate class
- */
- private function __construct() {
- trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
- }
-
- /**
- * Error-handler that mutes errors, alternative to shut-up operator.
- */
- public static function muteErrorHandler() {}
-
- /**
- * Cleans a UTF-8 string for well-formedness and SGML validity
- *
- * It will parse according to UTF-8 and return a valid UTF8 string, with
- * non-SGML codepoints excluded.
- *
- * @note Just for reference, the non-SGML code points are 0 to 31 and
- * 127 to 159, inclusive. However, we allow code points 9, 10
- * and 13, which are the tab, line feed and carriage return
- * respectively. 128 and above the code points map to multibyte
- * UTF-8 representations.
- *
- * @note Fallback code adapted from utf8ToUnicode by Henri Sivonen and
- * hsivonen@iki.fi at <http://iki.fi/hsivonen/php-utf8/> under the
- * LGPL license. Notes on what changed are inside, but in general,
- * the original code transformed UTF-8 text into an array of integer
- * Unicode codepoints. Understandably, transforming that back to
- * a string would be somewhat expensive, so the function was modded to
- * directly operate on the string. However, this discourages code
- * reuse, and the logic enumerated here would be useful for any
- * function that needs to be able to understand UTF-8 characters.
- * As of right now, only smart lossless character encoding converters
- * would need that, and I'm probably not going to implement them.
- * Once again, PHP 6 should solve all our problems.
- */
- public static function cleanUTF8($str, $force_php = false) {
-
- // UTF-8 validity is checked since PHP 4.3.5
- // This is an optimization: if the string is already valid UTF-8, no
- // need to do PHP stuff. 99% of the time, this will be the case.
- // The regexp matches the XML char production, as well as well as excluding
- // non-SGML codepoints U+007F to U+009F
- if (preg_match('/^[\x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]*$/Du', $str)) {
- return $str;
- }
-
- $mState = 0; // cached expected number of octets after the current octet
- // until the beginning of the next UTF8 character sequence
- $mUcs4 = 0; // cached Unicode character
- $mBytes = 1; // cached expected number of octets in the current sequence
-
- // original code involved an $out that was an array of Unicode
- // codepoints. Instead of having to convert back into UTF-8, we've
- // decided to directly append valid UTF-8 characters onto a string
- // $out once they're done. $char accumulates raw bytes, while $mUcs4
- // turns into the Unicode code point, so there's some redundancy.
-
- $out = '';
- $char = '';
-
- $len = strlen($str);
- for($i = 0; $i < $len; $i++) {
- $in = ord($str{$i});
- $char .= $str[$i]; // append byte to char
- if (0 == $mState) {
- // When mState is zero we expect either a US-ASCII character
- // or a multi-octet sequence.
- if (0 == (0x80 & ($in))) {
- // US-ASCII, pass straight through.
- if (($in <= 31 || $in == 127) &&
- !($in == 9 || $in == 13 || $in == 10) // save \r\t\n
- ) {
- // control characters, remove
- } else {
- $out .= $char;
- }
- // reset
- $char = '';
- $mBytes = 1;
- } elseif (0xC0 == (0xE0 & ($in))) {
- // First octet of 2 octet sequence
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x1F) << 6;
- $mState = 1;
- $mBytes = 2;
- } elseif (0xE0 == (0xF0 & ($in))) {
- // First octet of 3 octet sequence
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x0F) << 12;
- $mState = 2;
- $mBytes = 3;
- } elseif (0xF0 == (0xF8 & ($in))) {
- // First octet of 4 octet sequence
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x07) << 18;
- $mState = 3;
- $mBytes = 4;
- } elseif (0xF8 == (0xFC & ($in))) {
- // First octet of 5 octet sequence.
- //
- // This is illegal because the encoded codepoint must be
- // either:
- // (a) not the shortest form or
- // (b) outside the Unicode range of 0-0x10FFFF.
- // Rather than trying to resynchronize, we will carry on
- // until the end of the sequence and let the later error
- // handling code catch it.
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 0x03) << 24;
- $mState = 4;
- $mBytes = 5;
- } elseif (0xFC == (0xFE & ($in))) {
- // First octet of 6 octet sequence, see comments for 5
- // octet sequence.
- $mUcs4 = ($in);
- $mUcs4 = ($mUcs4 & 1) << 30;
- $mState = 5;
- $mBytes = 6;
- } else {
- // Current octet is neither in the US-ASCII range nor a
- // legal first octet of a multi-octet sequence.
- $mState = 0;
- $mUcs4 = 0;
- $mBytes = 1;
- $char = '';
- }
- } else {
- // When mState is non-zero, we expect a continuation of the
- // multi-octet sequence
- if (0x80 == (0xC0 & ($in))) {
- // Legal continuation.
- $shift = ($mState - 1) * 6;
- $tmp = $in;
- $tmp = ($tmp & 0x0000003F) << $shift;
- $mUcs4 |= $tmp;
-
- if (0 == --$mState) {
- // End of the multi-octet sequence. mUcs4 now contains
- // the final Unicode codepoint to be output
-
- // Check for illegal sequences and codepoints.
-
- // From Unicode 3.1, non-shortest form is illegal
- if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
- ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
- ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
- (4 < $mBytes) ||
- // From Unicode 3.2, surrogate characters = illegal
- (($mUcs4 & 0xFFFFF800) == 0xD800) ||
- // Codepoints outside the Unicode range are illegal
- ($mUcs4 > 0x10FFFF)
- ) {
-
- } elseif (0xFEFF != $mUcs4 && // omit BOM
- // check for valid Char unicode codepoints
- (
- 0x9 == $mUcs4 ||
- 0xA == $mUcs4 ||
- 0xD == $mUcs4 ||
- (0x20 <= $mUcs4 && 0x7E >= $mUcs4) ||
- // 7F-9F is not strictly prohibited by XML,
- // but it is non-SGML, and thus we don't allow it
- (0xA0 <= $mUcs4 && 0xD7FF >= $mUcs4) ||
- (0x10000 <= $mUcs4 && 0x10FFFF >= $mUcs4)
- )
- ) {
- $out .= $char;
- }
- // initialize UTF8 cache (reset)
- $mState = 0;
- $mUcs4 = 0;
- $mBytes = 1;
- $char = '';
- }
- } else {
- // ((0xC0 & (*in) != 0x80) && (mState != 0))
- // Incomplete multi-octet sequence.
- // used to result in complete fail, but we'll reset
- $mState = 0;
- $mUcs4 = 0;
- $mBytes = 1;
- $char ='';
- }
- }
- }
- return $out;
- }
-
- /**
- * Translates a Unicode codepoint into its corresponding UTF-8 character.
- * @note Based on Feyd's function at
- * <http://forums.devnetwork.net/viewtopic.php?p=191404#191404>,
- * which is in public domain.
- * @note While we're going to do code point parsing anyway, a good
- * optimization would be to refuse to translate code points that
- * are non-SGML characters. However, this could lead to duplication.
- * @note This is very similar to the unichr function in
- * maintenance/generate-entity-file.php (although this is superior,
- * due to its sanity checks).
- */
-
- // +----------+----------+----------+----------+
- // | 33222222 | 22221111 | 111111 | |
- // | 10987654 | 32109876 | 54321098 | 76543210 | bit
- // +----------+----------+----------+----------+
- // | | | | 0xxxxxxx | 1 byte 0x00000000..0x0000007F
- // | | | 110yyyyy | 10xxxxxx | 2 byte 0x00000080..0x000007FF
- // | | 1110zzzz | 10yyyyyy | 10xxxxxx | 3 byte 0x00000800..0x0000FFFF
- // | 11110www | 10wwzzzz | 10yyyyyy | 10xxxxxx | 4 byte 0x00010000..0x0010FFFF
- // +----------+----------+----------+----------+
- // | 00000000 | 00011111 | 11111111 | 11111111 | Theoretical upper limit of legal scalars: 2097151 (0x001FFFFF)
- // | 00000000 | 00010000 | 11111111 | 11111111 | Defined upper limit of legal scalar codes
- // +----------+----------+----------+----------+
-
- public static function unichr($code) {
- if($code > 1114111 or $code < 0 or
- ($code >= 55296 and $code <= 57343) ) {
- // bits are set outside the "valid" range as defined
- // by UNICODE 4.1.0
- return '';
- }
-
- $x = $y = $z = $w = 0;
- if ($code < 128) {
- // regular ASCII character
- $x = $code;
- } else {
- // set up bits for UTF-8
- $x = ($code & 63) | 128;
- if ($code < 2048) {
- $y = (($code & 2047) >> 6) | 192;
- } else {
- $y = (($code & 4032) >> 6) | 128;
- if($code < 65536) {
- $z = (($code >> 12) & 15) | 224;
- } else {
- $z = (($code >> 12) & 63) | 128;
- $w = (($code >> 18) & 7) | 240;
- }
- }
- }
- // set up the actual character
- $ret = '';
- if($w) $ret .= chr($w);
- if($z) $ret .= chr($z);
- if($y) $ret .= chr($y);
- $ret .= chr($x);
-
- return $ret;
- }
-
- /**
- * Converts a string to UTF-8 based on configuration.
- */
- public static function convertToUTF8($str, $config, $context) {
- $encoding = $config->get('Core.Encoding');
- if ($encoding === 'utf-8') return $str;
- static $iconv = null;
- if ($iconv === null) $iconv = function_exists('iconv');
- set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
- if ($iconv && !$config->get('Test.ForceNoIconv')) {
- $str = iconv($encoding, 'utf-8//IGNORE', $str);
- if ($str === false) {
- // $encoding is not a valid encoding
- restore_error_handler();
- trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
- return '';
- }
- // If the string is bjorked by Shift_JIS or a similar encoding
- // that doesn't support all of ASCII, convert the naughty
- // characters to their true byte-wise ASCII/UTF-8 equivalents.
- $str = strtr($str, HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding));
- restore_error_handler();
- return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_encode($str);
- restore_error_handler();
- return $str;
- }
- trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
- }
-
- /**
- * Converts a string from UTF-8 based on configuration.
- * @note Currently, this is a lossy conversion, with unexpressable
- * characters being omitted.
- */
- public static function convertFromUTF8($str, $config, $context) {
- $encoding = $config->get('Core.Encoding');
- if ($encoding === 'utf-8') return $str;
- static $iconv = null;
- if ($iconv === null) $iconv = function_exists('iconv');
- if ($escape = $config->get('Core.EscapeNonASCIICharacters')) {
- $str = HTMLPurifier_Encoder::convertToASCIIDumbLossless($str);
- }
- set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
- if ($iconv && !$config->get('Test.ForceNoIconv')) {
- // Undo our previous fix in convertToUTF8, otherwise iconv will barf
- $ascii_fix = HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding);
- if (!$escape && !empty($ascii_fix)) {
- $clear_fix = array();
- foreach ($ascii_fix as $utf8 => $native) $clear_fix[$utf8] = '';
- $str = strtr($str, $clear_fix);
- }
- $str = strtr($str, array_flip($ascii_fix));
- // Normal stuff
- $str = iconv('utf-8', $encoding . '//IGNORE', $str);
- restore_error_handler();
- return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_decode($str);
- restore_error_handler();
- return $str;
- }
- trigger_error('Encoding not supported', E_USER_ERROR);
- }
-
- /**
- * Lossless (character-wise) conversion of HTML to ASCII
- * @param $str UTF-8 string to be converted to ASCII
- * @returns ASCII encoded string with non-ASCII character entity-ized
- * @warning Adapted from MediaWiki, claiming fair use: this is a common
- * algorithm. If you disagree with this license fudgery,
- * implement it yourself.
- * @note Uses decimal numeric entities since they are best supported.
- * @note This is a DUMB function: it has no concept of keeping
- * character entities that the projected character encoding
- * can allow. We could possibly implement a smart version
- * but that would require it to also know which Unicode
- * codepoints the charset supported (not an easy task).
- * @note Sort of with cleanUTF8() but it assumes that $str is
- * well-formed UTF-8
- */
- public static function convertToASCIIDumbLossless($str) {
- $bytesleft = 0;
- $result = '';
- $working = 0;
- $len = strlen($str);
- for( $i = 0; $i < $len; $i++ ) {
- $bytevalue = ord( $str[$i] );
- if( $bytevalue <= 0x7F ) { //0xxx xxxx
- $result .= chr( $bytevalue );
- $bytesleft = 0;
- } elseif( $bytevalue <= 0xBF ) { //10xx xxxx
- $working = $working << 6;
- $working += ($bytevalue & 0x3F);
- $bytesleft--;
- if( $bytesleft <= 0 ) {
- $result .= "&#" . $working . ";";
- }
- } elseif( $bytevalue <= 0xDF ) { //110x xxxx
- $working = $bytevalue & 0x1F;
- $bytesleft = 1;
- } elseif( $bytevalue <= 0xEF ) { //1110 xxxx
- $working = $bytevalue & 0x0F;
- $bytesleft = 2;
- } else { //1111 0xxx
- $working = $bytevalue & 0x07;
- $bytesleft = 3;
- }
- }
- return $result;
- }
-
- /**
- * This expensive function tests whether or not a given character
- * encoding supports ASCII. 7/8-bit encodings like Shift_JIS will
- * fail this test, and require special processing. Variable width
- * encodings shouldn't ever fail.
- *
- * @param string $encoding Encoding name to test, as per iconv format
- * @param bool $bypass Whether or not to bypass the precompiled arrays.
- * @return Array of UTF-8 characters to their corresponding ASCII,
- * which can be used to "undo" any overzealous iconv action.
- */
- public static function testEncodingSupportsASCII($encoding, $bypass = false) {
- static $encodings = array();
- if (!$bypass) {
- if (isset($encodings[$encoding])) return $encodings[$encoding];
- $lenc = strtolower($encoding);
- switch ($lenc) {
- case 'shift_jis':
- return array("\xC2\xA5" => '\\', "\xE2\x80\xBE" => '~');
- case 'johab':
- return array("\xE2\x82\xA9" => '\\');
- }
- if (strpos($lenc, 'iso-8859-') === 0) return array();
- }
- $ret = array();
- set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
- if (iconv('UTF-8', $encoding, 'a') === false) return false;
- for ($i = 0x20; $i <= 0x7E; $i++) { // all printable ASCII chars
- $c = chr($i); // UTF-8 char
- $r = iconv('UTF-8', "$encoding//IGNORE", $c); // initial conversion
- if (
- $r === '' ||
- // This line is needed for iconv implementations that do not
- // omit characters that do not exist in the target character set
- ($r === $c && iconv($encoding, 'UTF-8//IGNORE', $r) !== $c)
- ) {
- // Reverse engineer: what's the UTF-8 equiv of this byte
- // sequence? This assumes that there's no variable width
- // encoding that doesn't support ASCII.
- $ret[iconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
- }
- }
- restore_error_handler();
- $encodings[$encoding] = $ret;
- return $ret;
- }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/EntityLookup.php b/extlib/HTMLPurifier/HTMLPurifier/EntityLookup.php
deleted file mode 100644
index b4dfce94c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/EntityLookup.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Object that provides entity lookup table from entity name to character
- */
-class HTMLPurifier_EntityLookup {
-
- /**
- * Assoc array of entity name to character represented.
- */
- public $table;
-
- /**
- * Sets up the entity lookup table from the serialized file contents.
- * @note The serialized contents are versioned, but were generated
- * using the maintenance script generate_entity_file.php
- * @warning This is not in constructor to help enforce the Singleton
- */
- public function setup($file = false) {
- if (!$file) {
- $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser';
- }
- $this->table = unserialize(file_get_contents($file));
- }
-
- /**
- * Retrieves sole instance of the object.
- * @param Optional prototype of custom lookup table to overload with.
- */
- public static function instance($prototype = false) {
- // no references, since PHP doesn't copy unless modified
- static $instance = null;
- if ($prototype) {
- $instance = $prototype;
- } elseif (!$instance) {
- $instance = new HTMLPurifier_EntityLookup();
- $instance->setup();
- }
- return $instance;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser b/extlib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
deleted file mode 100644
index f2b8b8f2d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
+++ /dev/null
@@ -1 +0,0 @@
-a:246:{s:4:"nbsp";s:2:" ";s:5:"iexcl";s:2:"¡";s:4:"cent";s:2:"¢";s:5:"pound";s:2:"£";s:6:"curren";s:2:"¤";s:3:"yen";s:2:"Â¥";s:6:"brvbar";s:2:"¦";s:4:"sect";s:2:"§";s:3:"uml";s:2:"¨";s:4:"copy";s:2:"©";s:4:"ordf";s:2:"ª";s:5:"laquo";s:2:"«";s:3:"not";s:2:"¬";s:3:"shy";s:2:"­";s:3:"reg";s:2:"®";s:4:"macr";s:2:"¯";s:3:"deg";s:2:"°";s:6:"plusmn";s:2:"±";s:5:"acute";s:2:"´";s:5:"micro";s:2:"µ";s:4:"para";s:2:"¶";s:6:"middot";s:2:"·";s:5:"cedil";s:2:"¸";s:4:"ordm";s:2:"º";s:5:"raquo";s:2:"»";s:6:"iquest";s:2:"¿";s:6:"Agrave";s:2:"À";s:6:"Aacute";s:2:"Ã";s:5:"Acirc";s:2:"Â";s:6:"Atilde";s:2:"Ã";s:4:"Auml";s:2:"Ä";s:5:"Aring";s:2:"Ã…";s:5:"AElig";s:2:"Æ";s:6:"Ccedil";s:2:"Ç";s:6:"Egrave";s:2:"È";s:6:"Eacute";s:2:"É";s:5:"Ecirc";s:2:"Ê";s:4:"Euml";s:2:"Ë";s:6:"Igrave";s:2:"ÃŒ";s:6:"Iacute";s:2:"Ã";s:5:"Icirc";s:2:"ÃŽ";s:4:"Iuml";s:2:"Ã";s:3:"ETH";s:2:"Ã";s:6:"Ntilde";s:2:"Ñ";s:6:"Ograve";s:2:"Ã’";s:6:"Oacute";s:2:"Ó";s:5:"Ocirc";s:2:"Ô";s:6:"Otilde";s:2:"Õ";s:4:"Ouml";s:2:"Ö";s:5:"times";s:2:"×";s:6:"Oslash";s:2:"Ø";s:6:"Ugrave";s:2:"Ù";s:6:"Uacute";s:2:"Ú";s:5:"Ucirc";s:2:"Û";s:4:"Uuml";s:2:"Ü";s:6:"Yacute";s:2:"Ã";s:5:"THORN";s:2:"Þ";s:5:"szlig";s:2:"ß";s:6:"agrave";s:2:"à";s:6:"aacute";s:2:"á";s:5:"acirc";s:2:"â";s:6:"atilde";s:2:"ã";s:4:"auml";s:2:"ä";s:5:"aring";s:2:"Ã¥";s:5:"aelig";s:2:"æ";s:6:"ccedil";s:2:"ç";s:6:"egrave";s:2:"è";s:6:"eacute";s:2:"é";s:5:"ecirc";s:2:"ê";s:4:"euml";s:2:"ë";s:6:"igrave";s:2:"ì";s:6:"iacute";s:2:"í";s:5:"icirc";s:2:"î";s:4:"iuml";s:2:"ï";s:3:"eth";s:2:"ð";s:6:"ntilde";s:2:"ñ";s:6:"ograve";s:2:"ò";s:6:"oacute";s:2:"ó";s:5:"ocirc";s:2:"ô";s:6:"otilde";s:2:"õ";s:4:"ouml";s:2:"ö";s:6:"divide";s:2:"÷";s:6:"oslash";s:2:"ø";s:6:"ugrave";s:2:"ù";s:6:"uacute";s:2:"ú";s:5:"ucirc";s:2:"û";s:4:"uuml";s:2:"ü";s:6:"yacute";s:2:"ý";s:5:"thorn";s:2:"þ";s:4:"yuml";s:2:"ÿ";s:4:"quot";s:1:""";s:3:"amp";s:1:"&";s:2:"lt";s:1:"<";s:2:"gt";s:1:">";s:4:"apos";s:1:"'";s:5:"OElig";s:2:"Å’";s:5:"oelig";s:2:"Å“";s:6:"Scaron";s:2:"Å ";s:6:"scaron";s:2:"Å¡";s:4:"Yuml";s:2:"Ÿ";s:4:"circ";s:2:"ˆ";s:5:"tilde";s:2:"Ëœ";s:4:"ensp";s:3:" ";s:4:"emsp";s:3:" ";s:6:"thinsp";s:3:" ";s:4:"zwnj";s:3:"‌";s:3:"zwj";s:3:"â€";s:3:"lrm";s:3:"‎";s:3:"rlm";s:3:"â€";s:5:"ndash";s:3:"–";s:5:"mdash";s:3:"—";s:5:"lsquo";s:3:"‘";s:5:"rsquo";s:3:"’";s:5:"sbquo";s:3:"‚";s:5:"ldquo";s:3:"“";s:5:"rdquo";s:3:"â€";s:5:"bdquo";s:3:"„";s:6:"dagger";s:3:"†";s:6:"Dagger";s:3:"‡";s:6:"permil";s:3:"‰";s:6:"lsaquo";s:3:"‹";s:6:"rsaquo";s:3:"›";s:4:"euro";s:3:"€";s:4:"fnof";s:2:"Æ’";s:5:"Alpha";s:2:"Α";s:4:"Beta";s:2:"Î’";s:5:"Gamma";s:2:"Γ";s:5:"Delta";s:2:"Δ";s:7:"Epsilon";s:2:"Ε";s:4:"Zeta";s:2:"Ζ";s:3:"Eta";s:2:"Η";s:5:"Theta";s:2:"Θ";s:4:"Iota";s:2:"Ι";s:5:"Kappa";s:2:"Κ";s:6:"Lambda";s:2:"Λ";s:2:"Mu";s:2:"Μ";s:2:"Nu";s:2:"Î";s:2:"Xi";s:2:"Ξ";s:7:"Omicron";s:2:"Ο";s:2:"Pi";s:2:"Π";s:3:"Rho";s:2:"Ρ";s:5:"Sigma";s:2:"Σ";s:3:"Tau";s:2:"Τ";s:7:"Upsilon";s:2:"Î¥";s:3:"Phi";s:2:"Φ";s:3:"Chi";s:2:"Χ";s:3:"Psi";s:2:"Ψ";s:5:"Omega";s:2:"Ω";s:5:"alpha";s:2:"α";s:4:"beta";s:2:"β";s:5:"gamma";s:2:"γ";s:5:"delta";s:2:"δ";s:7:"epsilon";s:2:"ε";s:4:"zeta";s:2:"ζ";s:3:"eta";s:2:"η";s:5:"theta";s:2:"θ";s:4:"iota";s:2:"ι";s:5:"kappa";s:2:"κ";s:6:"lambda";s:2:"λ";s:2:"mu";s:2:"μ";s:2:"nu";s:2:"ν";s:2:"xi";s:2:"ξ";s:7:"omicron";s:2:"ο";s:2:"pi";s:2:"Ï€";s:3:"rho";s:2:"Ï";s:6:"sigmaf";s:2:"Ï‚";s:5:"sigma";s:2:"σ";s:3:"tau";s:2:"Ï„";s:7:"upsilon";s:2:"Ï…";s:3:"phi";s:2:"φ";s:3:"chi";s:2:"χ";s:3:"psi";s:2:"ψ";s:5:"omega";s:2:"ω";s:8:"thetasym";s:2:"Ï‘";s:5:"upsih";s:2:"Ï’";s:3:"piv";s:2:"Ï–";s:4:"bull";s:3:"•";s:6:"hellip";s:3:"…";s:5:"prime";s:3:"′";s:5:"Prime";s:3:"″";s:5:"oline";s:3:"‾";s:5:"frasl";s:3:"â„";s:6:"weierp";s:3:"℘";s:5:"image";s:3:"â„‘";s:4:"real";s:3:"ℜ";s:5:"trade";s:3:"â„¢";s:7:"alefsym";s:3:"ℵ";s:4:"larr";s:3:"â†";s:4:"uarr";s:3:"↑";s:4:"rarr";s:3:"→";s:4:"darr";s:3:"↓";s:4:"harr";s:3:"↔";s:5:"crarr";s:3:"↵";s:4:"lArr";s:3:"â‡";s:4:"uArr";s:3:"⇑";s:4:"rArr";s:3:"⇒";s:4:"dArr";s:3:"⇓";s:4:"hArr";s:3:"⇔";s:6:"forall";s:3:"∀";s:4:"part";s:3:"∂";s:5:"exist";s:3:"∃";s:5:"empty";s:3:"∅";s:5:"nabla";s:3:"∇";s:4:"isin";s:3:"∈";s:5:"notin";s:3:"∉";s:2:"ni";s:3:"∋";s:4:"prod";s:3:"âˆ";s:3:"sum";s:3:"∑";s:5:"minus";s:3:"−";s:6:"lowast";s:3:"∗";s:5:"radic";s:3:"√";s:4:"prop";s:3:"âˆ";s:5:"infin";s:3:"∞";s:3:"ang";s:3:"∠";s:3:"and";s:3:"∧";s:2:"or";s:3:"∨";s:3:"cap";s:3:"∩";s:3:"cup";s:3:"∪";s:3:"int";s:3:"∫";s:3:"sim";s:3:"∼";s:4:"cong";s:3:"≅";s:5:"asymp";s:3:"≈";s:2:"ne";s:3:"≠";s:5:"equiv";s:3:"≡";s:2:"le";s:3:"≤";s:2:"ge";s:3:"≥";s:3:"sub";s:3:"⊂";s:3:"sup";s:3:"⊃";s:4:"nsub";s:3:"⊄";s:4:"sube";s:3:"⊆";s:4:"supe";s:3:"⊇";s:5:"oplus";s:3:"⊕";s:6:"otimes";s:3:"⊗";s:4:"perp";s:3:"⊥";s:4:"sdot";s:3:"â‹…";s:5:"lceil";s:3:"⌈";s:5:"rceil";s:3:"⌉";s:6:"lfloor";s:3:"⌊";s:6:"rfloor";s:3:"⌋";s:4:"lang";s:3:"〈";s:4:"rang";s:3:"〉";s:3:"loz";s:3:"â—Š";s:6:"spades";s:3:"â™ ";s:5:"clubs";s:3:"♣";s:6:"hearts";s:3:"♥";s:5:"diams";s:3:"♦";} \ No newline at end of file
diff --git a/extlib/HTMLPurifier/HTMLPurifier/EntityParser.php b/extlib/HTMLPurifier/HTMLPurifier/EntityParser.php
deleted file mode 100644
index 8c384472d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/EntityParser.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-// if want to implement error collecting here, we'll need to use some sort
-// of global data (probably trigger_error) because it's impossible to pass
-// $config or $context to the callback functions.
-
-/**
- * Handles referencing and derefencing character entities
- */
-class HTMLPurifier_EntityParser
-{
-
- /**
- * Reference to entity lookup table.
- */
- protected $_entity_lookup;
-
- /**
- * Callback regex string for parsing entities.
- */
- protected $_substituteEntitiesRegex =
-'/&(?:[#]x([a-fA-F0-9]+)|[#]0*(\d+)|([A-Za-z_:][A-Za-z0-9.\-_:]*));?/';
-// 1. hex 2. dec 3. string (XML style)
-
-
- /**
- * Decimal to parsed string conversion table for special entities.
- */
- protected $_special_dec2str =
- array(
- 34 => '"',
- 38 => '&',
- 39 => "'",
- 60 => '<',
- 62 => '>'
- );
-
- /**
- * Stripped entity names to decimal conversion table for special entities.
- */
- protected $_special_ent2dec =
- array(
- 'quot' => 34,
- 'amp' => 38,
- 'lt' => 60,
- 'gt' => 62
- );
-
- /**
- * Substitutes non-special entities with their parsed equivalents. Since
- * running this whenever you have parsed character is t3h 5uck, we run
- * it before everything else.
- *
- * @param $string String to have non-special entities parsed.
- * @returns Parsed string.
- */
- public function substituteNonSpecialEntities($string) {
- // it will try to detect missing semicolons, but don't rely on it
- return preg_replace_callback(
- $this->_substituteEntitiesRegex,
- array($this, 'nonSpecialEntityCallback'),
- $string
- );
- }
-
- /**
- * Callback function for substituteNonSpecialEntities() that does the work.
- *
- * @param $matches PCRE matches array, with 0 the entire match, and
- * either index 1, 2 or 3 set with a hex value, dec value,
- * or string (respectively).
- * @returns Replacement string.
- */
-
- protected function nonSpecialEntityCallback($matches) {
- // replaces all but big five
- $entity = $matches[0];
- $is_num = (@$matches[0][1] === '#');
- if ($is_num) {
- $is_hex = (@$entity[2] === 'x');
- $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
-
- // abort for special characters
- if (isset($this->_special_dec2str[$code])) return $entity;
-
- return HTMLPurifier_Encoder::unichr($code);
- } else {
- if (isset($this->_special_ent2dec[$matches[3]])) return $entity;
- if (!$this->_entity_lookup) {
- $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
- }
- if (isset($this->_entity_lookup->table[$matches[3]])) {
- return $this->_entity_lookup->table[$matches[3]];
- } else {
- return $entity;
- }
- }
- }
-
- /**
- * Substitutes only special entities with their parsed equivalents.
- *
- * @notice We try to avoid calling this function because otherwise, it
- * would have to be called a lot (for every parsed section).
- *
- * @param $string String to have non-special entities parsed.
- * @returns Parsed string.
- */
- public function substituteSpecialEntities($string) {
- return preg_replace_callback(
- $this->_substituteEntitiesRegex,
- array($this, 'specialEntityCallback'),
- $string);
- }
-
- /**
- * Callback function for substituteSpecialEntities() that does the work.
- *
- * This callback has same syntax as nonSpecialEntityCallback().
- *
- * @param $matches PCRE-style matches array, with 0 the entire match, and
- * either index 1, 2 or 3 set with a hex value, dec value,
- * or string (respectively).
- * @returns Replacement string.
- */
- protected function specialEntityCallback($matches) {
- $entity = $matches[0];
- $is_num = (@$matches[0][1] === '#');
- if ($is_num) {
- $is_hex = (@$entity[2] === 'x');
- $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
- return isset($this->_special_dec2str[$int]) ?
- $this->_special_dec2str[$int] :
- $entity;
- } else {
- return isset($this->_special_ent2dec[$matches[3]]) ?
- $this->_special_ent2dec[$matches[3]] :
- $entity;
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ErrorCollector.php b/extlib/HTMLPurifier/HTMLPurifier/ErrorCollector.php
deleted file mode 100644
index 6713eaf77..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ErrorCollector.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * Error collection class that enables HTML Purifier to report HTML
- * problems back to the user
- */
-class HTMLPurifier_ErrorCollector
-{
-
- /**
- * Identifiers for the returned error array. These are purposely numeric
- * so list() can be used.
- */
- const LINENO = 0;
- const SEVERITY = 1;
- const MESSAGE = 2;
- const CHILDREN = 3;
-
- protected $errors;
- protected $_current;
- protected $_stacks = array(array());
- protected $locale;
- protected $generator;
- protected $context;
-
- protected $lines = array();
-
- public function __construct($context) {
- $this->locale =& $context->get('Locale');
- $this->context = $context;
- $this->_current =& $this->_stacks[0];
- $this->errors =& $this->_stacks[0];
- }
-
- /**
- * Sends an error message to the collector for later use
- * @param $severity int Error severity, PHP error style (don't use E_USER_)
- * @param $msg string Error message text
- * @param $subst1 string First substitution for $msg
- * @param $subst2 string ...
- */
- public function send($severity, $msg) {
-
- $args = array();
- if (func_num_args() > 2) {
- $args = func_get_args();
- array_shift($args);
- unset($args[0]);
- }
-
- $token = $this->context->get('CurrentToken', true);
- $line = $token ? $token->line : $this->context->get('CurrentLine', true);
- $col = $token ? $token->col : $this->context->get('CurrentCol', true);
- $attr = $this->context->get('CurrentAttr', true);
-
- // perform special substitutions, also add custom parameters
- $subst = array();
- if (!is_null($token)) {
- $args['CurrentToken'] = $token;
- }
- if (!is_null($attr)) {
- $subst['$CurrentAttr.Name'] = $attr;
- if (isset($token->attr[$attr])) $subst['$CurrentAttr.Value'] = $token->attr[$attr];
- }
-
- if (empty($args)) {
- $msg = $this->locale->getMessage($msg);
- } else {
- $msg = $this->locale->formatMessage($msg, $args);
- }
-
- if (!empty($subst)) $msg = strtr($msg, $subst);
-
- // (numerically indexed)
- $error = array(
- self::LINENO => $line,
- self::SEVERITY => $severity,
- self::MESSAGE => $msg,
- self::CHILDREN => array()
- );
- $this->_current[] = $error;
-
-
- // NEW CODE BELOW ...
-
- $struct = null;
- // Top-level errors are either:
- // TOKEN type, if $value is set appropriately, or
- // "syntax" type, if $value is null
- $new_struct = new HTMLPurifier_ErrorStruct();
- $new_struct->type = HTMLPurifier_ErrorStruct::TOKEN;
- if ($token) $new_struct->value = clone $token;
- if (is_int($line) && is_int($col)) {
- if (isset($this->lines[$line][$col])) {
- $struct = $this->lines[$line][$col];
- } else {
- $struct = $this->lines[$line][$col] = $new_struct;
- }
- // These ksorts may present a performance problem
- ksort($this->lines[$line], SORT_NUMERIC);
- } else {
- if (isset($this->lines[-1])) {
- $struct = $this->lines[-1];
- } else {
- $struct = $this->lines[-1] = $new_struct;
- }
- }
- ksort($this->lines, SORT_NUMERIC);
-
- // Now, check if we need to operate on a lower structure
- if (!empty($attr)) {
- $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);
- if (!$struct->value) {
- $struct->value = array($attr, 'PUT VALUE HERE');
- }
- }
- if (!empty($cssprop)) {
- $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);
- if (!$struct->value) {
- // if we tokenize CSS this might be a little more difficult to do
- $struct->value = array($cssprop, 'PUT VALUE HERE');
- }
- }
-
- // Ok, structs are all setup, now time to register the error
- $struct->addError($severity, $msg);
- }
-
- /**
- * Retrieves raw error data for custom formatter to use
- * @param List of arrays in format of array(line of error,
- * error severity, error message,
- * recursive sub-errors array)
- */
- public function getRaw() {
- return $this->errors;
- }
-
- /**
- * Default HTML formatting implementation for error messages
- * @param $config Configuration array, vital for HTML output nature
- * @param $errors Errors array to display; used for recursion.
- */
- public function getHTMLFormatted($config, $errors = null) {
- $ret = array();
-
- $this->generator = new HTMLPurifier_Generator($config, $this->context);
- if ($errors === null) $errors = $this->errors;
-
- // 'At line' message needs to be removed
-
- // generation code for new structure goes here. It needs to be recursive.
- foreach ($this->lines as $line => $col_array) {
- if ($line == -1) continue;
- foreach ($col_array as $col => $struct) {
- $this->_renderStruct($ret, $struct, $line, $col);
- }
- }
- if (isset($this->lines[-1])) {
- $this->_renderStruct($ret, $this->lines[-1]);
- }
-
- if (empty($errors)) {
- return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
- } else {
- return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
- }
-
- }
-
- private function _renderStruct(&$ret, $struct, $line = null, $col = null) {
- $stack = array($struct);
- $context_stack = array(array());
- while ($current = array_pop($stack)) {
- $context = array_pop($context_stack);
- foreach ($current->errors as $error) {
- list($severity, $msg) = $error;
- $string = '';
- $string .= '<div>';
- // W3C uses an icon to indicate the severity of the error.
- $error = $this->locale->getErrorName($severity);
- $string .= "<span class=\"error e$severity\"><strong>$error</strong></span> ";
- if (!is_null($line) && !is_null($col)) {
- $string .= "<em class=\"location\">Line $line, Column $col: </em> ";
- } else {
- $string .= '<em class="location">End of Document: </em> ';
- }
- $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> ';
- $string .= '</div>';
- // Here, have a marker for the character on the column appropriate.
- // Be sure to clip extremely long lines.
- //$string .= '<pre>';
- //$string .= '';
- //$string .= '</pre>';
- $ret[] = $string;
- }
- foreach ($current->children as $type => $array) {
- $context[] = $current;
- $stack = array_merge($stack, array_reverse($array, true));
- for ($i = count($array); $i > 0; $i--) {
- $context_stack[] = $context;
- }
- }
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/ErrorStruct.php b/extlib/HTMLPurifier/HTMLPurifier/ErrorStruct.php
deleted file mode 100644
index 9bc8996ec..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/ErrorStruct.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Records errors for particular segments of an HTML document such as tokens,
- * attributes or CSS properties. They can contain error structs (which apply
- * to components of what they represent), but their main purpose is to hold
- * errors applying to whatever struct is being used.
- */
-class HTMLPurifier_ErrorStruct
-{
-
- /**
- * Possible values for $children first-key. Note that top-level structures
- * are automatically token-level.
- */
- const TOKEN = 0;
- const ATTR = 1;
- const CSSPROP = 2;
-
- /**
- * Type of this struct.
- */
- public $type;
-
- /**
- * Value of the struct we are recording errors for. There are various
- * values for this:
- * - TOKEN: Instance of HTMLPurifier_Token
- * - ATTR: array('attr-name', 'value')
- * - CSSPROP: array('prop-name', 'value')
- */
- public $value;
-
- /**
- * Errors registered for this structure.
- */
- public $errors = array();
-
- /**
- * Child ErrorStructs that are from this structure. For example, a TOKEN
- * ErrorStruct would contain ATTR ErrorStructs. This is a multi-dimensional
- * array in structure: [TYPE]['identifier']
- */
- public $children = array();
-
- public function getChild($type, $id) {
- if (!isset($this->children[$type][$id])) {
- $this->children[$type][$id] = new HTMLPurifier_ErrorStruct();
- $this->children[$type][$id]->type = $type;
- }
- return $this->children[$type][$id];
- }
-
- public function addError($severity, $message) {
- $this->errors[] = array($severity, $message);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Exception.php b/extlib/HTMLPurifier/HTMLPurifier/Exception.php
deleted file mode 100644
index be85b4c56..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Exception.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Global exception class for HTML Purifier; any exceptions we throw
- * are from here.
- */
-class HTMLPurifier_Exception extends Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Filter.php b/extlib/HTMLPurifier/HTMLPurifier/Filter.php
deleted file mode 100644
index 9a0e7b09f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Filter.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Represents a pre or post processing filter on HTML Purifier's output
- *
- * Sometimes, a little ad-hoc fixing of HTML has to be done before
- * it gets sent through HTML Purifier: you can use filters to acheive
- * this effect. For instance, YouTube videos can be preserved using
- * this manner. You could have used a decorator for this task, but
- * PHP's support for them is not terribly robust, so we're going
- * to just loop through the filters.
- *
- * Filters should be exited first in, last out. If there are three filters,
- * named 1, 2 and 3, the order of execution should go 1->preFilter,
- * 2->preFilter, 3->preFilter, purify, 3->postFilter, 2->postFilter,
- * 1->postFilter.
- *
- * @note Methods are not declared abstract as it is perfectly legitimate
- * for an implementation not to want anything to happen on a step
- */
-
-class HTMLPurifier_Filter
-{
-
- /**
- * Name of the filter for identification purposes
- */
- public $name;
-
- /**
- * Pre-processor function, handles HTML before HTML Purifier
- */
- public function preFilter($html, $config, $context) {
- return $html;
- }
-
- /**
- * Post-processor function, handles HTML after HTML Purifier
- */
- public function postFilter($html, $config, $context) {
- return $html;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php b/extlib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
deleted file mode 100644
index bbf78a663..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * This filter extracts <style> blocks from input HTML, cleans them up
- * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
- * so they can be used elsewhere in the document.
- *
- * @note
- * See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
- * sample usage.
- *
- * @note
- * This filter can also be used on stylesheets not included in the
- * document--something purists would probably prefer. Just directly
- * call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
- */
-class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
-{
-
- public $name = 'ExtractStyleBlocks';
- private $_styleMatches = array();
- private $_tidy;
-
- public function __construct() {
- $this->_tidy = new csstidy();
- }
-
- /**
- * Save the contents of CSS blocks to style matches
- * @param $matches preg_replace style $matches array
- */
- protected function styleCallback($matches) {
- $this->_styleMatches[] = $matches[1];
- }
-
- /**
- * Removes inline <style> tags from HTML, saves them for later use
- * @todo Extend to indicate non-text/css style blocks
- */
- public function preFilter($html, $config, $context) {
- $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
- if ($tidy !== null) $this->_tidy = $tidy;
- $html = preg_replace_callback('#<style(?:\s.*)?>(.+)</style>#isU', array($this, 'styleCallback'), $html);
- $style_blocks = $this->_styleMatches;
- $this->_styleMatches = array(); // reset
- $context->register('StyleBlocks', $style_blocks); // $context must not be reused
- if ($this->_tidy) {
- foreach ($style_blocks as &$style) {
- $style = $this->cleanCSS($style, $config, $context);
- }
- }
- return $html;
- }
-
- /**
- * Takes CSS (the stuff found in <style>) and cleans it.
- * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
- * @param $css CSS styling to clean
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return Cleaned CSS
- */
- public function cleanCSS($css, $config, $context) {
- // prepare scope
- $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
- if ($scope !== null) {
- $scopes = array_map('trim', explode(',', $scope));
- } else {
- $scopes = array();
- }
- // remove comments from CSS
- $css = trim($css);
- if (strncmp('<!--', $css, 4) === 0) {
- $css = substr($css, 4);
- }
- if (strlen($css) > 3 && substr($css, -3) == '-->') {
- $css = substr($css, 0, -3);
- }
- $css = trim($css);
- $this->_tidy->parse($css);
- $css_definition = $config->getDefinition('CSS');
- foreach ($this->_tidy->css as $k => $decls) {
- // $decls are all CSS declarations inside an @ selector
- $new_decls = array();
- foreach ($decls as $selector => $style) {
- $selector = trim($selector);
- if ($selector === '') continue; // should not happen
- if ($selector[0] === '+') {
- if ($selector !== '' && $selector[0] === '+') continue;
- }
- if (!empty($scopes)) {
- $new_selector = array(); // because multiple ones are possible
- $selectors = array_map('trim', explode(',', $selector));
- foreach ($scopes as $s1) {
- foreach ($selectors as $s2) {
- $new_selector[] = "$s1 $s2";
- }
- }
- $selector = implode(', ', $new_selector); // now it's a string
- }
- foreach ($style as $name => $value) {
- if (!isset($css_definition->info[$name])) {
- unset($style[$name]);
- continue;
- }
- $def = $css_definition->info[$name];
- $ret = $def->validate($value, $config, $context);
- if ($ret === false) unset($style[$name]);
- else $style[$name] = $ret;
- }
- $new_decls[$selector] = $style;
- }
- $this->_tidy->css[$k] = $new_decls;
- }
- // remove stuff that shouldn't be used, could be reenabled
- // after security risks are analyzed
- $this->_tidy->import = array();
- $this->_tidy->charset = null;
- $this->_tidy->namespace = null;
- $css = $this->_tidy->print->plain();
- // we are going to escape any special characters <>& to ensure
- // that no funny business occurs (i.e. </style> in a font-family prop).
- if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
- $css = str_replace(
- array('<', '>', '&'),
- array('\3C ', '\3E ', '\26 '),
- $css
- );
- }
- return $css;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php b/extlib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
deleted file mode 100644
index aca972f6c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
-{
-
- public $name = 'YouTube';
-
- public function preFilter($html, $config, $context) {
- $pre_regex = '#<object[^>]+>.+?'.
- 'http://www.youtube.com/v/([A-Za-z0-9\-_]+).+?</object>#s';
- $pre_replace = '<span class="youtube-embed">\1</span>';
- return preg_replace($pre_regex, $pre_replace, $html);
- }
-
- public function postFilter($html, $config, $context) {
- $post_regex = '#<span class="youtube-embed">([A-Za-z0-9\-_]+)</span>#';
- return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
- }
-
- protected function armorUrl($url) {
- return str_replace('--', '-&#45;', $url);
- }
-
- protected function postFilterCallback($matches) {
- $url = $this->armorUrl($matches[1]);
- return '<object width="425" height="350" type="application/x-shockwave-flash" '.
- 'data="http://www.youtube.com/v/'.$url.'">'.
- '<param name="movie" value="http://www.youtube.com/v/'.$url.'"></param>'.
- '<!--[if IE]>'.
- '<embed src="http://www.youtube.com/v/'.$url.'"'.
- 'type="application/x-shockwave-flash"'.
- 'wmode="transparent" width="425" height="350" />'.
- '<![endif]-->'.
- '</object>';
-
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Generator.php b/extlib/HTMLPurifier/HTMLPurifier/Generator.php
deleted file mode 100644
index 24bd8a54e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Generator.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * Generates HTML from tokens.
- * @todo Refactor interface so that configuration/context is determined
- * upon instantiation, no need for messy generateFromTokens() calls
- * @todo Make some of the more internal functions protected, and have
- * unit tests work around that
- */
-class HTMLPurifier_Generator
-{
-
- /**
- * Whether or not generator should produce XML output
- */
- private $_xhtml = true;
-
- /**
- * :HACK: Whether or not generator should comment the insides of <script> tags
- */
- private $_scriptFix = false;
-
- /**
- * Cache of HTMLDefinition during HTML output to determine whether or
- * not attributes should be minimized.
- */
- private $_def;
-
- /**
- * Cache of %Output.SortAttr
- */
- private $_sortAttr;
-
- /**
- * Configuration for the generator
- */
- protected $config;
-
- /**
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- */
- public function __construct($config, $context) {
- $this->config = $config;
- $this->_scriptFix = $config->get('Output.CommentScriptContents');
- $this->_sortAttr = $config->get('Output.SortAttr');
- $this->_def = $config->getHTMLDefinition();
- $this->_xhtml = $this->_def->doctype->xml;
- }
-
- /**
- * Generates HTML from an array of tokens.
- * @param $tokens Array of HTMLPurifier_Token
- * @param $config HTMLPurifier_Config object
- * @return Generated HTML
- */
- public function generateFromTokens($tokens) {
- if (!$tokens) return '';
-
- // Basic algorithm
- $html = '';
- for ($i = 0, $size = count($tokens); $i < $size; $i++) {
- if ($this->_scriptFix && $tokens[$i]->name === 'script'
- && $i + 2 < $size && $tokens[$i+2] instanceof HTMLPurifier_Token_End) {
- // script special case
- // the contents of the script block must be ONE token
- // for this to work.
- $html .= $this->generateFromToken($tokens[$i++]);
- $html .= $this->generateScriptFromToken($tokens[$i++]);
- }
- $html .= $this->generateFromToken($tokens[$i]);
- }
-
- // Tidy cleanup
- if (extension_loaded('tidy') && $this->config->get('Output.TidyFormat')) {
- $tidy = new Tidy;
- $tidy->parseString($html, array(
- 'indent'=> true,
- 'output-xhtml' => $this->_xhtml,
- 'show-body-only' => true,
- 'indent-spaces' => 2,
- 'wrap' => 68,
- ), 'utf8');
- $tidy->cleanRepair();
- $html = (string) $tidy; // explicit cast necessary
- }
-
- // Normalize newlines to system defined value
- $nl = $this->config->get('Output.Newline');
- if ($nl === null) $nl = PHP_EOL;
- if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
- return $html;
- }
-
- /**
- * Generates HTML from a single token.
- * @param $token HTMLPurifier_Token object.
- * @return Generated HTML
- */
- public function generateFromToken($token) {
- if (!$token instanceof HTMLPurifier_Token) {
- trigger_error('Cannot generate HTML from non-HTMLPurifier_Token object', E_USER_WARNING);
- return '';
-
- } elseif ($token instanceof HTMLPurifier_Token_Start) {
- $attr = $this->generateAttributes($token->attr, $token->name);
- return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
-
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- return '</' . $token->name . '>';
-
- } elseif ($token instanceof HTMLPurifier_Token_Empty) {
- $attr = $this->generateAttributes($token->attr, $token->name);
- return '<' . $token->name . ($attr ? ' ' : '') . $attr .
- ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
- . '>';
-
- } elseif ($token instanceof HTMLPurifier_Token_Text) {
- return $this->escape($token->data, ENT_NOQUOTES);
-
- } elseif ($token instanceof HTMLPurifier_Token_Comment) {
- return '<!--' . $token->data . '-->';
- } else {
- return '';
-
- }
- }
-
- /**
- * Special case processor for the contents of script tags
- * @warning This runs into problems if there's already a literal
- * --> somewhere inside the script contents.
- */
- public function generateScriptFromToken($token) {
- if (!$token instanceof HTMLPurifier_Token_Text) return $this->generateFromToken($token);
- // Thanks <http://lachy.id.au/log/2005/05/script-comments>
- $data = preg_replace('#//\s*$#', '', $token->data);
- return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
- }
-
- /**
- * Generates attribute declarations from attribute array.
- * @note This does not include the leading or trailing space.
- * @param $assoc_array_of_attributes Attribute array
- * @param $element Name of element attributes are for, used to check
- * attribute minimization.
- * @return Generate HTML fragment for insertion.
- */
- public function generateAttributes($assoc_array_of_attributes, $element = false) {
- $html = '';
- if ($this->_sortAttr) ksort($assoc_array_of_attributes);
- foreach ($assoc_array_of_attributes as $key => $value) {
- if (!$this->_xhtml) {
- // Remove namespaced attributes
- if (strpos($key, ':') !== false) continue;
- // Check if we should minimize the attribute: val="val" -> val
- if ($element && !empty($this->_def->info[$element]->attr[$key]->minimized)) {
- $html .= $key . ' ';
- continue;
- }
- }
- $html .= $key.'="'.$this->escape($value).'" ';
- }
- return rtrim($html);
- }
-
- /**
- * Escapes raw text data.
- * @todo This really ought to be protected, but until we have a facility
- * for properly generating HTML here w/o using tokens, it stays
- * public.
- * @param $string String data to escape for HTML.
- * @param $quote Quoting style, like htmlspecialchars. ENT_NOQUOTES is
- * permissible for non-attribute output.
- * @return String escaped data.
- */
- public function escape($string, $quote = ENT_COMPAT) {
- return htmlspecialchars($string, $quote, 'UTF-8');
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
deleted file mode 100644
index c99ac11eb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-
-/**
- * Definition of the purified HTML that describes allowed children,
- * attributes, and many other things.
- *
- * Conventions:
- *
- * All member variables that are prefixed with info
- * (including the main $info array) are used by HTML Purifier internals
- * and should not be directly edited when customizing the HTMLDefinition.
- * They can usually be set via configuration directives or custom
- * modules.
- *
- * On the other hand, member variables without the info prefix are used
- * internally by the HTMLDefinition and MUST NOT be used by other HTML
- * Purifier internals. Many of them, however, are public, and may be
- * edited by userspace code to tweak the behavior of HTMLDefinition.
- *
- * @note This class is inspected by Printer_HTMLDefinition; please
- * update that class if things here change.
- *
- * @warning Directives that change this object's structure must be in
- * the HTML or Attr namespace!
- */
-class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
-{
-
- // FULLY-PUBLIC VARIABLES ---------------------------------------------
-
- /**
- * Associative array of element names to HTMLPurifier_ElementDef
- */
- public $info = array();
-
- /**
- * Associative array of global attribute name to attribute definition.
- */
- public $info_global_attr = array();
-
- /**
- * String name of parent element HTML will be going into.
- */
- public $info_parent = 'div';
-
- /**
- * Definition for parent element, allows parent element to be a
- * tag that's not allowed inside the HTML fragment.
- */
- public $info_parent_def;
-
- /**
- * String name of element used to wrap inline elements in block context
- * @note This is rarely used except for BLOCKQUOTEs in strict mode
- */
- public $info_block_wrapper = 'p';
-
- /**
- * Associative array of deprecated tag name to HTMLPurifier_TagTransform
- */
- public $info_tag_transform = array();
-
- /**
- * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
- */
- public $info_attr_transform_pre = array();
-
- /**
- * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
- */
- public $info_attr_transform_post = array();
-
- /**
- * Nested lookup array of content set name (Block, Inline) to
- * element name to whether or not it belongs in that content set.
- */
- public $info_content_sets = array();
-
- /**
- * Indexed list of HTMLPurifier_Injector to be used.
- */
- public $info_injector = array();
-
- /**
- * Doctype object
- */
- public $doctype;
-
-
-
- // RAW CUSTOMIZATION STUFF --------------------------------------------
-
- /**
- * Adds a custom attribute to a pre-existing element
- * @note This is strictly convenience, and does not have a corresponding
- * method in HTMLPurifier_HTMLModule
- * @param $element_name String element name to add attribute to
- * @param $attr_name String name of attribute
- * @param $def Attribute definition, can be string or object, see
- * HTMLPurifier_AttrTypes for details
- */
- public function addAttribute($element_name, $attr_name, $def) {
- $module = $this->getAnonymousModule();
- if (!isset($module->info[$element_name])) {
- $element = $module->addBlankElement($element_name);
- } else {
- $element = $module->info[$element_name];
- }
- $element->attr[$attr_name] = $def;
- }
-
- /**
- * Adds a custom element to your HTML definition
- * @note See HTMLPurifier_HTMLModule::addElement for detailed
- * parameter and return value descriptions.
- */
- public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array()) {
- $module = $this->getAnonymousModule();
- // assume that if the user is calling this, the element
- // is safe. This may not be a good idea
- $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
- return $element;
- }
-
- /**
- * Adds a blank element to your HTML definition, for overriding
- * existing behavior
- * @note See HTMLPurifier_HTMLModule::addBlankElement for detailed
- * parameter and return value descriptions.
- */
- public function addBlankElement($element_name) {
- $module = $this->getAnonymousModule();
- $element = $module->addBlankElement($element_name);
- return $element;
- }
-
- /**
- * Retrieves a reference to the anonymous module, so you can
- * bust out advanced features without having to make your own
- * module.
- */
- public function getAnonymousModule() {
- if (!$this->_anonModule) {
- $this->_anonModule = new HTMLPurifier_HTMLModule();
- $this->_anonModule->name = 'Anonymous';
- }
- return $this->_anonModule;
- }
-
- private $_anonModule;
-
-
- // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
-
- public $type = 'HTML';
- public $manager; /**< Instance of HTMLPurifier_HTMLModuleManager */
-
- /**
- * Performs low-cost, preliminary initialization.
- */
- public function __construct() {
- $this->manager = new HTMLPurifier_HTMLModuleManager();
- }
-
- protected function doSetup($config) {
- $this->processModules($config);
- $this->setupConfigStuff($config);
- unset($this->manager);
-
- // cleanup some of the element definitions
- foreach ($this->info as $k => $v) {
- unset($this->info[$k]->content_model);
- unset($this->info[$k]->content_model_type);
- }
- }
-
- /**
- * Extract out the information from the manager
- */
- protected function processModules($config) {
-
- if ($this->_anonModule) {
- // for user specific changes
- // this is late-loaded so we don't have to deal with PHP4
- // reference wonky-ness
- $this->manager->addModule($this->_anonModule);
- unset($this->_anonModule);
- }
-
- $this->manager->setup($config);
- $this->doctype = $this->manager->doctype;
-
- foreach ($this->manager->modules as $module) {
- foreach($module->info_tag_transform as $k => $v) {
- if ($v === false) unset($this->info_tag_transform[$k]);
- else $this->info_tag_transform[$k] = $v;
- }
- foreach($module->info_attr_transform_pre as $k => $v) {
- if ($v === false) unset($this->info_attr_transform_pre[$k]);
- else $this->info_attr_transform_pre[$k] = $v;
- }
- foreach($module->info_attr_transform_post as $k => $v) {
- if ($v === false) unset($this->info_attr_transform_post[$k]);
- else $this->info_attr_transform_post[$k] = $v;
- }
- foreach ($module->info_injector as $k => $v) {
- if ($v === false) unset($this->info_injector[$k]);
- else $this->info_injector[$k] = $v;
- }
- }
-
- $this->info = $this->manager->getElements();
- $this->info_content_sets = $this->manager->contentSets->lookup;
-
- }
-
- /**
- * Sets up stuff based on config. We need a better way of doing this.
- */
- protected function setupConfigStuff($config) {
-
- $block_wrapper = $config->get('HTML.BlockWrapper');
- if (isset($this->info_content_sets['Block'][$block_wrapper])) {
- $this->info_block_wrapper = $block_wrapper;
- } else {
- trigger_error('Cannot use non-block element as block wrapper',
- E_USER_ERROR);
- }
-
- $parent = $config->get('HTML.Parent');
- $def = $this->manager->getElement($parent, true);
- if ($def) {
- $this->info_parent = $parent;
- $this->info_parent_def = $def;
- } else {
- trigger_error('Cannot use unrecognized element as parent',
- E_USER_ERROR);
- $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
- }
-
- // support template text
- $support = "(for information on implementing this, see the ".
- "support forums) ";
-
- // setup allowed elements -----------------------------------------
-
- $allowed_elements = $config->get('HTML.AllowedElements');
- $allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
-
- if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
- $allowed = $config->get('HTML.Allowed');
- if (is_string($allowed)) {
- list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
- }
- }
-
- if (is_array($allowed_elements)) {
- foreach ($this->info as $name => $d) {
- if(!isset($allowed_elements[$name])) unset($this->info[$name]);
- unset($allowed_elements[$name]);
- }
- // emit errors
- foreach ($allowed_elements as $element => $d) {
- $element = htmlspecialchars($element); // PHP doesn't escape errors, be careful!
- trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
- }
- }
-
- // setup allowed attributes ---------------------------------------
-
- $allowed_attributes_mutable = $allowed_attributes; // by copy!
- if (is_array($allowed_attributes)) {
-
- // This actually doesn't do anything, since we went away from
- // global attributes. It's possible that userland code uses
- // it, but HTMLModuleManager doesn't!
- foreach ($this->info_global_attr as $attr => $x) {
- $keys = array($attr, "*@$attr", "*.$attr");
- $delete = true;
- foreach ($keys as $key) {
- if ($delete && isset($allowed_attributes[$key])) {
- $delete = false;
- }
- if (isset($allowed_attributes_mutable[$key])) {
- unset($allowed_attributes_mutable[$key]);
- }
- }
- if ($delete) unset($this->info_global_attr[$attr]);
- }
-
- foreach ($this->info as $tag => $info) {
- foreach ($info->attr as $attr => $x) {
- $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
- $delete = true;
- foreach ($keys as $key) {
- if ($delete && isset($allowed_attributes[$key])) {
- $delete = false;
- }
- if (isset($allowed_attributes_mutable[$key])) {
- unset($allowed_attributes_mutable[$key]);
- }
- }
- if ($delete) unset($this->info[$tag]->attr[$attr]);
- }
- }
- // emit errors
- foreach ($allowed_attributes_mutable as $elattr => $d) {
- $bits = preg_split('/[.@]/', $elattr, 2);
- $c = count($bits);
- switch ($c) {
- case 2:
- if ($bits[0] !== '*') {
- $element = htmlspecialchars($bits[0]);
- $attribute = htmlspecialchars($bits[1]);
- if (!isset($this->info[$element])) {
- trigger_error("Cannot allow attribute '$attribute' if element '$element' is not allowed/supported $support");
- } else {
- trigger_error("Attribute '$attribute' in element '$element' not supported $support",
- E_USER_WARNING);
- }
- break;
- }
- // otherwise fall through
- case 1:
- $attribute = htmlspecialchars($bits[0]);
- trigger_error("Global attribute '$attribute' is not ".
- "supported in any elements $support",
- E_USER_WARNING);
- break;
- }
- }
-
- }
-
- // setup forbidden elements ---------------------------------------
-
- $forbidden_elements = $config->get('HTML.ForbiddenElements');
- $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
-
- foreach ($this->info as $tag => $info) {
- if (isset($forbidden_elements[$tag])) {
- unset($this->info[$tag]);
- continue;
- }
- foreach ($info->attr as $attr => $x) {
- if (
- isset($forbidden_attributes["$tag@$attr"]) ||
- isset($forbidden_attributes["*@$attr"]) ||
- isset($forbidden_attributes[$attr])
- ) {
- unset($this->info[$tag]->attr[$attr]);
- continue;
- } // this segment might get removed eventually
- elseif (isset($forbidden_attributes["$tag.$attr"])) {
- // $tag.$attr are not user supplied, so no worries!
- trigger_error("Error with $tag.$attr: tag.attr syntax not supported for HTML.ForbiddenAttributes; use tag@attr instead", E_USER_WARNING);
- }
- }
- }
- foreach ($forbidden_attributes as $key => $v) {
- if (strlen($key) < 2) continue;
- if ($key[0] != '*') continue;
- if ($key[1] == '.') {
- trigger_error("Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead", E_USER_WARNING);
- }
- }
-
- // setup injectors -----------------------------------------------------
- foreach ($this->info_injector as $i => $injector) {
- if ($injector->checkNeeded($config) !== false) {
- // remove injector that does not have it's required
- // elements/attributes present, and is thus not needed.
- unset($this->info_injector[$i]);
- }
- }
- }
-
- /**
- * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
- * separate lists for processing. Format is element[attr1|attr2],element2...
- * @warning Although it's largely drawn from TinyMCE's implementation,
- * it is different, and you'll probably have to modify your lists
- * @param $list String list to parse
- * @param array($allowed_elements, $allowed_attributes)
- * @todo Give this its own class, probably static interface
- */
- public function parseTinyMCEAllowedList($list) {
-
- $list = str_replace(array(' ', "\t"), '', $list);
-
- $elements = array();
- $attributes = array();
-
- $chunks = preg_split('/(,|[\n\r]+)/', $list);
- foreach ($chunks as $chunk) {
- if (empty($chunk)) continue;
- // remove TinyMCE element control characters
- if (!strpos($chunk, '[')) {
- $element = $chunk;
- $attr = false;
- } else {
- list($element, $attr) = explode('[', $chunk);
- }
- if ($element !== '*') $elements[$element] = true;
- if (!$attr) continue;
- $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
- $attr = explode('|', $attr);
- foreach ($attr as $key) {
- $attributes["$element.$key"] = true;
- }
- }
-
- return array($elements, $attributes);
-
- }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule.php
deleted file mode 100644
index 072cf6808..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/**
- * Represents an XHTML 1.1 module, with information on elements, tags
- * and attributes.
- * @note Even though this is technically XHTML 1.1, it is also used for
- * regular HTML parsing. We are using modulization as a convenient
- * way to represent the internals of HTMLDefinition, and our
- * implementation is by no means conforming and does not directly
- * use the normative DTDs or XML schemas.
- * @note The public variables in a module should almost directly
- * correspond to the variables in HTMLPurifier_HTMLDefinition.
- * However, the prefix info carries no special meaning in these
- * objects (include it anyway if that's the correspondence though).
- * @todo Consider making some member functions protected
- */
-
-class HTMLPurifier_HTMLModule
-{
-
- // -- Overloadable ----------------------------------------------------
-
- /**
- * Short unique string identifier of the module
- */
- public $name;
-
- /**
- * Informally, a list of elements this module changes. Not used in
- * any significant way.
- */
- public $elements = array();
-
- /**
- * Associative array of element names to element definitions.
- * Some definitions may be incomplete, to be merged in later
- * with the full definition.
- */
- public $info = array();
-
- /**
- * Associative array of content set names to content set additions.
- * This is commonly used to, say, add an A element to the Inline
- * content set. This corresponds to an internal variable $content_sets
- * and NOT info_content_sets member variable of HTMLDefinition.
- */
- public $content_sets = array();
-
- /**
- * Associative array of attribute collection names to attribute
- * collection additions. More rarely used for adding attributes to
- * the global collections. Example is the StyleAttribute module adding
- * the style attribute to the Core. Corresponds to HTMLDefinition's
- * attr_collections->info, since the object's data is only info,
- * with extra behavior associated with it.
- */
- public $attr_collections = array();
-
- /**
- * Associative array of deprecated tag name to HTMLPurifier_TagTransform
- */
- public $info_tag_transform = array();
-
- /**
- * List of HTMLPurifier_AttrTransform to be performed before validation.
- */
- public $info_attr_transform_pre = array();
-
- /**
- * List of HTMLPurifier_AttrTransform to be performed after validation.
- */
- public $info_attr_transform_post = array();
-
- /**
- * List of HTMLPurifier_Injector to be performed during well-formedness fixing.
- * An injector will only be invoked if all of it's pre-requisites are met;
- * if an injector fails setup, there will be no error; it will simply be
- * silently disabled.
- */
- public $info_injector = array();
-
- /**
- * Boolean flag that indicates whether or not getChildDef is implemented.
- * For optimization reasons: may save a call to a function. Be sure
- * to set it if you do implement getChildDef(), otherwise it will have
- * no effect!
- */
- public $defines_child_def = false;
-
- /**
- * Boolean flag whether or not this module is safe. If it is not safe, all
- * of its members are unsafe. Modules are safe by default (this might be
- * slightly dangerous, but it doesn't make much sense to force HTML Purifier,
- * which is based off of safe HTML, to explicitly say, "This is safe," even
- * though there are modules which are "unsafe")
- *
- * @note Previously, safety could be applied at an element level granularity.
- * We've removed this ability, so in order to add "unsafe" elements
- * or attributes, a dedicated module with this property set to false
- * must be used.
- */
- public $safe = true;
-
- /**
- * Retrieves a proper HTMLPurifier_ChildDef subclass based on
- * content_model and content_model_type member variables of
- * the HTMLPurifier_ElementDef class. There is a similar function
- * in HTMLPurifier_HTMLDefinition.
- * @param $def HTMLPurifier_ElementDef instance
- * @return HTMLPurifier_ChildDef subclass
- */
- public function getChildDef($def) {return false;}
-
- // -- Convenience -----------------------------------------------------
-
- /**
- * Convenience function that sets up a new element
- * @param $element Name of element to add
- * @param $type What content set should element be registered to?
- * Set as false to skip this step.
- * @param $contents Allowed children in form of:
- * "$content_model_type: $content_model"
- * @param $attr_includes What attribute collections to register to
- * element?
- * @param $attr What unique attributes does the element define?
- * @note See ElementDef for in-depth descriptions of these parameters.
- * @return Created element definition object, so you
- * can set advanced parameters
- */
- public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array()) {
- $this->elements[] = $element;
- // parse content_model
- list($content_model_type, $content_model) = $this->parseContents($contents);
- // merge in attribute inclusions
- $this->mergeInAttrIncludes($attr, $attr_includes);
- // add element to content sets
- if ($type) $this->addElementToContentSet($element, $type);
- // create element
- $this->info[$element] = HTMLPurifier_ElementDef::create(
- $content_model, $content_model_type, $attr
- );
- // literal object $contents means direct child manipulation
- if (!is_string($contents)) $this->info[$element]->child = $contents;
- return $this->info[$element];
- }
-
- /**
- * Convenience function that creates a totally blank, non-standalone
- * element.
- * @param $element Name of element to create
- * @return Created element
- */
- public function addBlankElement($element) {
- if (!isset($this->info[$element])) {
- $this->elements[] = $element;
- $this->info[$element] = new HTMLPurifier_ElementDef();
- $this->info[$element]->standalone = false;
- } else {
- trigger_error("Definition for $element already exists in module, cannot redefine");
- }
- return $this->info[$element];
- }
-
- /**
- * Convenience function that registers an element to a content set
- * @param Element to register
- * @param Name content set (warning: case sensitive, usually upper-case
- * first letter)
- */
- public function addElementToContentSet($element, $type) {
- if (!isset($this->content_sets[$type])) $this->content_sets[$type] = '';
- else $this->content_sets[$type] .= ' | ';
- $this->content_sets[$type] .= $element;
- }
-
- /**
- * Convenience function that transforms single-string contents
- * into separate content model and content model type
- * @param $contents Allowed children in form of:
- * "$content_model_type: $content_model"
- * @note If contents is an object, an array of two nulls will be
- * returned, and the callee needs to take the original $contents
- * and use it directly.
- */
- public function parseContents($contents) {
- if (!is_string($contents)) return array(null, null); // defer
- switch ($contents) {
- // check for shorthand content model forms
- case 'Empty':
- return array('empty', '');
- case 'Inline':
- return array('optional', 'Inline | #PCDATA');
- case 'Flow':
- return array('optional', 'Flow | #PCDATA');
- }
- list($content_model_type, $content_model) = explode(':', $contents);
- $content_model_type = strtolower(trim($content_model_type));
- $content_model = trim($content_model);
- return array($content_model_type, $content_model);
- }
-
- /**
- * Convenience function that merges a list of attribute includes into
- * an attribute array.
- * @param $attr Reference to attr array to modify
- * @param $attr_includes Array of includes / string include to merge in
- */
- public function mergeInAttrIncludes(&$attr, $attr_includes) {
- if (!is_array($attr_includes)) {
- if (empty($attr_includes)) $attr_includes = array();
- else $attr_includes = array($attr_includes);
- }
- $attr[0] = $attr_includes;
- }
-
- /**
- * Convenience function that generates a lookup table with boolean
- * true as value.
- * @param $list List of values to turn into a lookup
- * @note You can also pass an arbitrary number of arguments in
- * place of the regular argument
- * @return Lookup array equivalent of list
- */
- public function makeLookup($list) {
- if (is_string($list)) $list = func_get_args();
- $ret = array();
- foreach ($list as $value) {
- if (is_null($value)) continue;
- $ret[$value] = true;
- }
- return $ret;
- }
-
- /**
- * Lazy load construction of the module after determining whether
- * or not it's needed, and also when a finalized configuration object
- * is available.
- * @param $config Instance of HTMLPurifier_Config
- */
- public function setup($config) {}
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
deleted file mode 100644
index 3d66f1b4e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Bi-directional Text Module, defines elements that
- * declare directionality of content. Text Extension Module.
- */
-class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Bdo';
- public $attr_collections = array(
- 'I18N' => array('dir' => false)
- );
-
- public function setup($config) {
- $bdo = $this->addElement(
- 'bdo', 'Inline', 'Inline', array('Core', 'Lang'),
- array(
- 'dir' => 'Enum#ltr,rtl', // required
- // The Abstract Module specification has the attribute
- // inclusions wrong for bdo: bdo allows Lang
- )
- );
- $bdo->attr_transform_post['required-dir'] = new HTMLPurifier_AttrTransform_BdoDir();
-
- $this->attr_collections['I18N']['dir'] = 'Enum#ltr,rtl';
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
deleted file mode 100644
index 7c15da84f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
-{
- public $name = 'CommonAttributes';
-
- public $attr_collections = array(
- 'Core' => array(
- 0 => array('Style'),
- // 'xml:space' => false,
- 'class' => 'Class',
- 'id' => 'ID',
- 'title' => 'CDATA',
- ),
- 'Lang' => array(),
- 'I18N' => array(
- 0 => array('Lang'), // proprietary, for xml:lang/lang
- ),
- 'Common' => array(
- 0 => array('Core', 'I18N')
- )
- );
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
deleted file mode 100644
index ff9369055..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Edit';
-
- public function setup($config) {
- $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';
- $attr = array(
- 'cite' => 'URI',
- // 'datetime' => 'Datetime', // not implemented
- );
- $this->addElement('del', 'Inline', $contents, 'Common', $attr);
- $this->addElement('ins', 'Inline', $contents, 'Common', $attr);
- }
-
- // HTML 4.01 specifies that ins/del must not contain block
- // elements when used in an inline context, chameleon is
- // a complicated workaround to acheive this effect
-
- // Inline context ! Block context (exclamation mark is
- // separator, see getChildDef for parsing)
-
- public $defines_child_def = true;
- public function getChildDef($def) {
- if ($def->content_model_type != 'chameleon') return false;
- $value = explode('!', $def->content_model);
- return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
deleted file mode 100644
index 44c22f6f8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Forms module, defines all form-related elements found in HTML 4.
- */
-class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
-{
- public $name = 'Forms';
- public $safe = false;
-
- public $content_sets = array(
- 'Block' => 'Form',
- 'Inline' => 'Formctrl',
- );
-
- public function setup($config) {
- $form = $this->addElement('form', 'Form',
- 'Required: Heading | List | Block | fieldset', 'Common', array(
- 'accept' => 'ContentTypes',
- 'accept-charset' => 'Charsets',
- 'action*' => 'URI',
- 'method' => 'Enum#get,post',
- // really ContentType, but these two are the only ones used today
- 'enctype' => 'Enum#application/x-www-form-urlencoded,multipart/form-data',
- ));
- $form->excludes = array('form' => true);
-
- $input = $this->addElement('input', 'Formctrl', 'Empty', 'Common', array(
- 'accept' => 'ContentTypes',
- 'accesskey' => 'Character',
- 'alt' => 'Text',
- 'checked' => 'Bool#checked',
- 'disabled' => 'Bool#disabled',
- 'maxlength' => 'Number',
- 'name' => 'CDATA',
- 'readonly' => 'Bool#readonly',
- 'size' => 'Number',
- 'src' => 'URI#embeds',
- 'tabindex' => 'Number',
- 'type' => 'Enum#text,password,checkbox,button,radio,submit,reset,file,hidden,image',
- 'value' => 'CDATA',
- ));
- $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input();
-
- $this->addElement('select', 'Formctrl', 'Required: optgroup | option', 'Common', array(
- 'disabled' => 'Bool#disabled',
- 'multiple' => 'Bool#multiple',
- 'name' => 'CDATA',
- 'size' => 'Number',
- 'tabindex' => 'Number',
- ));
-
- $this->addElement('option', false, 'Optional: #PCDATA', 'Common', array(
- 'disabled' => 'Bool#disabled',
- 'label' => 'Text',
- 'selected' => 'Bool#selected',
- 'value' => 'CDATA',
- ));
- // It's illegal for there to be more than one selected, but not
- // be multiple. Also, no selected means undefined behavior. This might
- // be difficult to implement; perhaps an injector, or a context variable.
-
- $textarea = $this->addElement('textarea', 'Formctrl', 'Optional: #PCDATA', 'Common', array(
- 'accesskey' => 'Character',
- 'cols*' => 'Number',
- 'disabled' => 'Bool#disabled',
- 'name' => 'CDATA',
- 'readonly' => 'Bool#readonly',
- 'rows*' => 'Number',
- 'tabindex' => 'Number',
- ));
- $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea();
-
- $button = $this->addElement('button', 'Formctrl', 'Optional: #PCDATA | Heading | List | Block | Inline', 'Common', array(
- 'accesskey' => 'Character',
- 'disabled' => 'Bool#disabled',
- 'name' => 'CDATA',
- 'tabindex' => 'Number',
- 'type' => 'Enum#button,submit,reset',
- 'value' => 'CDATA',
- ));
-
- // For exclusions, ideally we'd specify content sets, not literal elements
- $button->excludes = $this->makeLookup(
- 'form', 'fieldset', // Form
- 'input', 'select', 'textarea', 'label', 'button', // Formctrl
- 'a' // as per HTML 4.01 spec, this is omitted by modularization
- );
-
- // Extra exclusion: img usemap="" is not permitted within this element.
- // We'll omit this for now, since we don't have any good way of
- // indicating it yet.
-
- // This is HIGHLY user-unfriendly; we need a custom child-def for this
- $this->addElement('fieldset', 'Form', 'Custom: (#WS?,legend,(Flow|#PCDATA)*)', 'Common');
-
- $label = $this->addElement('label', 'Formctrl', 'Optional: #PCDATA | Inline', 'Common', array(
- 'accesskey' => 'Character',
- // 'for' => 'IDREF', // IDREF not implemented, cannot allow
- ));
- $label->excludes = array('label' => true);
-
- $this->addElement('legend', false, 'Optional: #PCDATA | Inline', 'Common', array(
- 'accesskey' => 'Character',
- ));
-
- $this->addElement('optgroup', false, 'Required: option', 'Common', array(
- 'disabled' => 'Bool#disabled',
- 'label*' => 'Text',
- ));
-
- // Don't forget an injector for <isindex>. This one's a little complex
- // because it maps to multiple elements.
-
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
deleted file mode 100644
index d7e9bdd27..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Hypertext Module, defines hypertext links. Core Module.
- */
-class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Hypertext';
-
- public function setup($config) {
- $a = $this->addElement(
- 'a', 'Inline', 'Inline', 'Common',
- array(
- // 'accesskey' => 'Character',
- // 'charset' => 'Charset',
- 'href' => 'URI',
- // 'hreflang' => 'LanguageCode',
- 'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
- 'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
- // 'tabindex' => 'Number',
- // 'type' => 'ContentType',
- )
- );
- $a->formatting = true;
- $a->excludes = array('a' => true);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
deleted file mode 100644
index 948d435bc..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Image Module provides basic image embedding.
- * @note There is specialized code for removing empty images in
- * HTMLPurifier_Strategy_RemoveForeignElements
- */
-class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Image';
-
- public function setup($config) {
- $max = $config->get('HTML.MaxImgLength');
- $img = $this->addElement(
- 'img', 'Inline', 'Empty', 'Common',
- array(
- 'alt*' => 'Text',
- // According to the spec, it's Length, but percents can
- // be abused, so we allow only Pixels.
- 'height' => 'Pixels#' . $max,
- 'width' => 'Pixels#' . $max,
- 'longdesc' => 'URI',
- 'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
- )
- );
- if ($max === null || $config->get('HTML.Trusted')) {
- $img->attr['height'] =
- $img->attr['width'] = 'Length';
- }
-
- // kind of strange, but splitting things up would be inefficient
- $img->attr_transform_pre[] =
- $img->attr_transform_post[] =
- new HTMLPurifier_AttrTransform_ImgRequired();
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
deleted file mode 100644
index df33927ba..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Legacy module defines elements that were previously
- * deprecated.
- *
- * @note Not all legacy elements have been implemented yet, which
- * is a bit of a reverse problem as compared to browsers! In
- * addition, this legacy module may implement a bit more than
- * mandated by XHTML 1.1.
- *
- * This module can be used in combination with TransformToStrict in order
- * to transform as many deprecated elements as possible, but retain
- * questionably deprecated elements that do not have good alternatives
- * as well as transform elements that don't have an implementation.
- * See docs/ref-strictness.txt for more details.
- */
-
-class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Legacy';
-
- public function setup($config) {
-
- $this->addElement('basefont', 'Inline', 'Empty', false, array(
- 'color' => 'Color',
- 'face' => 'Text', // extremely broad, we should
- 'size' => 'Text', // tighten it
- 'id' => 'ID'
- ));
- $this->addElement('center', 'Block', 'Flow', 'Common');
- $this->addElement('dir', 'Block', 'Required: li', 'Common', array(
- 'compact' => 'Bool#compact'
- ));
- $this->addElement('font', 'Inline', 'Inline', array('Core', 'I18N'), array(
- 'color' => 'Color',
- 'face' => 'Text', // extremely broad, we should
- 'size' => 'Text', // tighten it
- ));
- $this->addElement('menu', 'Block', 'Required: li', 'Common', array(
- 'compact' => 'Bool#compact'
- ));
-
- $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
- $s->formatting = true;
-
- $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
- $strike->formatting = true;
-
- $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
- $u->formatting = true;
-
- // setup modifications to old elements
-
- $align = 'Enum#left,right,center,justify';
-
- $address = $this->addBlankElement('address');
- $address->content_model = 'Inline | #PCDATA | p';
- $address->content_model_type = 'optional';
- $address->child = false;
-
- $blockquote = $this->addBlankElement('blockquote');
- $blockquote->content_model = 'Flow | #PCDATA';
- $blockquote->content_model_type = 'optional';
- $blockquote->child = false;
-
- $br = $this->addBlankElement('br');
- $br->attr['clear'] = 'Enum#left,all,right,none';
-
- $caption = $this->addBlankElement('caption');
- $caption->attr['align'] = 'Enum#top,bottom,left,right';
-
- $div = $this->addBlankElement('div');
- $div->attr['align'] = $align;
-
- $dl = $this->addBlankElement('dl');
- $dl->attr['compact'] = 'Bool#compact';
-
- for ($i = 1; $i <= 6; $i++) {
- $h = $this->addBlankElement("h$i");
- $h->attr['align'] = $align;
- }
-
- $hr = $this->addBlankElement('hr');
- $hr->attr['align'] = $align;
- $hr->attr['noshade'] = 'Bool#noshade';
- $hr->attr['size'] = 'Pixels';
- $hr->attr['width'] = 'Length';
-
- $img = $this->addBlankElement('img');
- $img->attr['align'] = 'Enum#top,middle,bottom,left,right';
- $img->attr['border'] = 'Pixels';
- $img->attr['hspace'] = 'Pixels';
- $img->attr['vspace'] = 'Pixels';
-
- // figure out this integer business
-
- $li = $this->addBlankElement('li');
- $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
- $li->attr['type'] = 'Enum#s:1,i,I,a,A,disc,square,circle';
-
- $ol = $this->addBlankElement('ol');
- $ol->attr['compact'] = 'Bool#compact';
- $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
- $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
-
- $p = $this->addBlankElement('p');
- $p->attr['align'] = $align;
-
- $pre = $this->addBlankElement('pre');
- $pre->attr['width'] = 'Number';
-
- // script omitted
-
- $table = $this->addBlankElement('table');
- $table->attr['align'] = 'Enum#left,center,right';
- $table->attr['bgcolor'] = 'Color';
-
- $tr = $this->addBlankElement('tr');
- $tr->attr['bgcolor'] = 'Color';
-
- $th = $this->addBlankElement('th');
- $th->attr['bgcolor'] = 'Color';
- $th->attr['height'] = 'Length';
- $th->attr['nowrap'] = 'Bool#nowrap';
- $th->attr['width'] = 'Length';
-
- $td = $this->addBlankElement('td');
- $td->attr['bgcolor'] = 'Color';
- $td->attr['height'] = 'Length';
- $td->attr['nowrap'] = 'Bool#nowrap';
- $td->attr['width'] = 'Length';
-
- $ul = $this->addBlankElement('ul');
- $ul->attr['compact'] = 'Bool#compact';
- $ul->attr['type'] = 'Enum#square,disc,circle';
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
deleted file mode 100644
index 1d15f2729..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 List Module, defines list-oriented elements. Core Module.
- */
-class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'List';
-
- // According to the abstract schema, the List content set is a fully formed
- // one or more expr, but it invariably occurs in an optional declaration
- // so we're not going to do that subtlety. It might cause trouble
- // if a user defines "List" and expects that multiple lists are
- // allowed to be specified, but then again, that's not very intuitive.
- // Furthermore, the actual XML Schema may disagree. Regardless,
- // we don't have support for such nested expressions without using
- // the incredibly inefficient and draconic Custom ChildDef.
-
- public $content_sets = array('Flow' => 'List');
-
- public function setup($config) {
- $this->addElement('ol', 'List', 'Required: li', 'Common');
- $this->addElement('ul', 'List', 'Required: li', 'Common');
- $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
-
- $this->addElement('li', false, 'Flow', 'Common');
-
- $this->addElement('dd', false, 'Flow', 'Common');
- $this->addElement('dt', false, 'Inline', 'Common');
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
deleted file mode 100644
index 05694b450..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Name';
-
- public function setup($config) {
- $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
- foreach ($elements as $name) {
- $element = $this->addBlankElement($name);
- $element->attr['name'] = 'CDATA';
- if (!$config->get('HTML.Attr.Name.UseCDATA')) {
- $element->attr_transform_post['NameSync'] = new HTMLPurifier_AttrTransform_NameSync();
- }
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
deleted file mode 100644
index 5f1b14abb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
- public $name = 'NonXMLCommonAttributes';
-
- public $attr_collections = array(
- 'Lang' => array(
- 'lang' => 'LanguageCode',
- )
- );
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
deleted file mode 100644
index 193c1011f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Object Module, defines elements for generic object inclusion
- * @warning Users will commonly use <embed> to cater to legacy browsers: this
- * module does not allow this sort of behavior
- */
-class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Object';
- public $safe = false;
-
- public function setup($config) {
-
- $this->addElement('object', 'Inline', 'Optional: #PCDATA | Flow | param', 'Common',
- array(
- 'archive' => 'URI',
- 'classid' => 'URI',
- 'codebase' => 'URI',
- 'codetype' => 'Text',
- 'data' => 'URI',
- 'declare' => 'Bool#declare',
- 'height' => 'Length',
- 'name' => 'CDATA',
- 'standby' => 'Text',
- 'tabindex' => 'Number',
- 'type' => 'ContentType',
- 'width' => 'Length'
- )
- );
-
- $this->addElement('param', false, 'Empty', false,
- array(
- 'id' => 'ID',
- 'name*' => 'Text',
- 'type' => 'Text',
- 'value' => 'Text',
- 'valuetype' => 'Enum#data,ref,object'
- )
- );
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
deleted file mode 100644
index 8ff0b5ed7..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Presentation Module, defines simple presentation-related
- * markup. Text Extension Module.
- * @note The official XML Schema and DTD specs further divide this into
- * two modules:
- * - Block Presentation (hr)
- * - Inline Presentation (b, big, i, small, sub, sup, tt)
- * We have chosen not to heed this distinction, as content_sets
- * provides satisfactory disambiguation.
- */
-class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Presentation';
-
- public function setup($config) {
- $this->addElement('hr', 'Block', 'Empty', 'Common');
- $this->addElement('sub', 'Inline', 'Inline', 'Common');
- $this->addElement('sup', 'Inline', 'Inline', 'Common');
- $b = $this->addElement('b', 'Inline', 'Inline', 'Common');
- $b->formatting = true;
- $big = $this->addElement('big', 'Inline', 'Inline', 'Common');
- $big->formatting = true;
- $i = $this->addElement('i', 'Inline', 'Inline', 'Common');
- $i->formatting = true;
- $small = $this->addElement('small', 'Inline', 'Inline', 'Common');
- $small->formatting = true;
- $tt = $this->addElement('tt', 'Inline', 'Inline', 'Common');
- $tt->formatting = true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
deleted file mode 100644
index dd36a3de0..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Module defines proprietary tags and attributes in HTML.
- * @warning If this module is enabled, standards-compliance is off!
- */
-class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Proprietary';
-
- public function setup($config) {
-
- $this->addElement('marquee', 'Inline', 'Flow', 'Common',
- array(
- 'direction' => 'Enum#left,right,up,down',
- 'behavior' => 'Enum#alternate',
- 'width' => 'Length',
- 'height' => 'Length',
- 'scrolldelay' => 'Number',
- 'scrollamount' => 'Number',
- 'loop' => 'Number',
- 'bgcolor' => 'Color',
- 'hspace' => 'Pixels',
- 'vspace' => 'Pixels',
- )
- );
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
deleted file mode 100644
index b26a0a30a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Ruby Annotation Module, defines elements that indicate
- * short runs of text alongside base text for annotation or pronounciation.
- */
-class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Ruby';
-
- public function setup($config) {
- $this->addElement('ruby', 'Inline',
- 'Custom: ((rb, (rt | (rp, rt, rp))) | (rbc, rtc, rtc?))',
- 'Common');
- $this->addElement('rbc', false, 'Required: rb', 'Common');
- $this->addElement('rtc', false, 'Required: rt', 'Common');
- $rb = $this->addElement('rb', false, 'Inline', 'Common');
- $rb->excludes = array('ruby' => true);
- $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));
- $rt->excludes = array('ruby' => true);
- $this->addElement('rp', false, 'Optional: #PCDATA', 'Common');
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
deleted file mode 100644
index 8fc03cb1c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * A "safe" embed module. See SafeObject. This is a proprietary element.
- */
-class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'SafeEmbed';
-
- public function setup($config) {
-
- $max = $config->get('HTML.MaxImgLength');
- $embed = $this->addElement(
- 'embed', 'Inline', 'Empty', 'Common',
- array(
- 'src*' => 'URI#embedded',
- 'type' => 'Enum#application/x-shockwave-flash',
- 'width' => 'Pixels#' . $max,
- 'height' => 'Pixels#' . $max,
- 'allowscriptaccess' => 'Enum#never',
- 'allownetworking' => 'Enum#internal',
- 'wmode' => 'Enum#window',
- 'name' => 'ID',
- )
- );
- $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed();
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
deleted file mode 100644
index 33bac00cf..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * A "safe" object module. In theory, objects permitted by this module will
- * be safe, and untrusted users can be allowed to embed arbitrary flash objects
- * (maybe other types too, but only Flash is supported as of right now).
- * Highly experimental.
- */
-class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'SafeObject';
-
- public function setup($config) {
-
- // These definitions are not intrinsically safe: the attribute transforms
- // are a vital part of ensuring safety.
-
- $max = $config->get('HTML.MaxImgLength');
- $object = $this->addElement(
- 'object',
- 'Inline',
- 'Optional: param | Flow | #PCDATA',
- 'Common',
- array(
- // While technically not required by the spec, we're forcing
- // it to this value.
- 'type' => 'Enum#application/x-shockwave-flash',
- 'width' => 'Pixels#' . $max,
- 'height' => 'Pixels#' . $max,
- 'data' => 'URI#embedded'
- )
- );
- $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
-
- $param = $this->addElement('param', false, 'Empty', false,
- array(
- 'id' => 'ID',
- 'name*' => 'Text',
- 'value' => 'Text'
- )
- );
- $param->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeParam();
- $this->info_injector[] = 'SafeObject';
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
deleted file mode 100644
index cecdea6c3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
-
-WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
-INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
-
-*/
-
-/**
- * XHTML 1.1 Scripting module, defines elements that are used to contain
- * information pertaining to executable scripts or the lack of support
- * for executable scripts.
- * @note This module does not contain inline scripting elements
- */
-class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
-{
- public $name = 'Scripting';
- public $elements = array('script', 'noscript');
- public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');
- public $safe = false;
-
- public function setup($config) {
- // TODO: create custom child-definition for noscript that
- // auto-wraps stray #PCDATA in a similar manner to
- // blockquote's custom definition (we would use it but
- // blockquote's contents are optional while noscript's contents
- // are required)
-
- // TODO: convert this to new syntax, main problem is getting
- // both content sets working
-
- // In theory, this could be safe, but I don't see any reason to
- // allow it.
- $this->info['noscript'] = new HTMLPurifier_ElementDef();
- $this->info['noscript']->attr = array( 0 => array('Common') );
- $this->info['noscript']->content_model = 'Heading | List | Block';
- $this->info['noscript']->content_model_type = 'required';
-
- $this->info['script'] = new HTMLPurifier_ElementDef();
- $this->info['script']->attr = array(
- 'defer' => new HTMLPurifier_AttrDef_Enum(array('defer')),
- 'src' => new HTMLPurifier_AttrDef_URI(true),
- 'type' => new HTMLPurifier_AttrDef_Enum(array('text/javascript'))
- );
- $this->info['script']->content_model = '#PCDATA';
- $this->info['script']->content_model_type = 'optional';
- $this->info['script']->attr_transform_pre['type'] =
- $this->info['script']->attr_transform_post['type'] =
- new HTMLPurifier_AttrTransform_ScriptRequired();
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
deleted file mode 100644
index eb78464cc..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'StyleAttribute';
- public $attr_collections = array(
- // The inclusion routine differs from the Abstract Modules but
- // is in line with the DTD and XML Schemas.
- 'Style' => array('style' => false), // see constructor
- 'Core' => array(0 => array('Style'))
- );
-
- public function setup($config) {
- $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
deleted file mode 100644
index f314ced3f..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Tables Module, fully defines accessible table elements.
- */
-class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Tables';
-
- public function setup($config) {
-
- $this->addElement('caption', false, 'Inline', 'Common');
-
- $this->addElement('table', 'Block',
- new HTMLPurifier_ChildDef_Table(), 'Common',
- array(
- 'border' => 'Pixels',
- 'cellpadding' => 'Length',
- 'cellspacing' => 'Length',
- 'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
- 'rules' => 'Enum#none,groups,rows,cols,all',
- 'summary' => 'Text',
- 'width' => 'Length'
- )
- );
-
- // common attributes
- $cell_align = array(
- 'align' => 'Enum#left,center,right,justify,char',
- 'charoff' => 'Length',
- 'valign' => 'Enum#top,middle,bottom,baseline',
- );
-
- $cell_t = array_merge(
- array(
- 'abbr' => 'Text',
- 'colspan' => 'Number',
- 'rowspan' => 'Number',
- ),
- $cell_align
- );
- $this->addElement('td', false, 'Flow', 'Common', $cell_t);
- $this->addElement('th', false, 'Flow', 'Common', $cell_t);
-
- $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
-
- $cell_col = array_merge(
- array(
- 'span' => 'Number',
- 'width' => 'MultiLength',
- ),
- $cell_align
- );
- $this->addElement('col', false, 'Empty', 'Common', $cell_col);
- $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
-
- $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
- $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
- $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
deleted file mode 100644
index 2b844ecc4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Target Module, defines target attribute in link elements.
- */
-class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Target';
-
- public function setup($config) {
- $elements = array('a');
- foreach ($elements as $name) {
- $e = $this->addBlankElement($name);
- $e->attr = array(
- 'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
- );
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
deleted file mode 100644
index ae77c7188..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Text Module, defines basic text containers. Core Module.
- * @note In the normative XML Schema specification, this module
- * is further abstracted into the following modules:
- * - Block Phrasal (address, blockquote, pre, h1, h2, h3, h4, h5, h6)
- * - Block Structural (div, p)
- * - Inline Phrasal (abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var)
- * - Inline Structural (br, span)
- * This module, functionally, does not distinguish between these
- * sub-modules, but the code is internally structured to reflect
- * these distinctions.
- */
-class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
-{
-
- public $name = 'Text';
- public $content_sets = array(
- 'Flow' => 'Heading | Block | Inline'
- );
-
- public function setup($config) {
-
- // Inline Phrasal -------------------------------------------------
- $this->addElement('abbr', 'Inline', 'Inline', 'Common');
- $this->addElement('acronym', 'Inline', 'Inline', 'Common');
- $this->addElement('cite', 'Inline', 'Inline', 'Common');
- $this->addElement('dfn', 'Inline', 'Inline', 'Common');
- $this->addElement('kbd', 'Inline', 'Inline', 'Common');
- $this->addElement('q', 'Inline', 'Inline', 'Common', array('cite' => 'URI'));
- $this->addElement('samp', 'Inline', 'Inline', 'Common');
- $this->addElement('var', 'Inline', 'Inline', 'Common');
-
- $em = $this->addElement('em', 'Inline', 'Inline', 'Common');
- $em->formatting = true;
-
- $strong = $this->addElement('strong', 'Inline', 'Inline', 'Common');
- $strong->formatting = true;
-
- $code = $this->addElement('code', 'Inline', 'Inline', 'Common');
- $code->formatting = true;
-
- // Inline Structural ----------------------------------------------
- $this->addElement('span', 'Inline', 'Inline', 'Common');
- $this->addElement('br', 'Inline', 'Empty', 'Core');
-
- // Block Phrasal --------------------------------------------------
- $this->addElement('address', 'Block', 'Inline', 'Common');
- $this->addElement('blockquote', 'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI') );
- $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
- $pre->excludes = $this->makeLookup(
- 'img', 'big', 'small', 'object', 'applet', 'font', 'basefont' );
- $this->addElement('h1', 'Heading', 'Inline', 'Common');
- $this->addElement('h2', 'Heading', 'Inline', 'Common');
- $this->addElement('h3', 'Heading', 'Inline', 'Common');
- $this->addElement('h4', 'Heading', 'Inline', 'Common');
- $this->addElement('h5', 'Heading', 'Inline', 'Common');
- $this->addElement('h6', 'Heading', 'Inline', 'Common');
-
- // Block Structural -----------------------------------------------
- $p = $this->addElement('p', 'Block', 'Inline', 'Common');
- $p->autoclose = array_flip(array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul"));
-
- $this->addElement('div', 'Block', 'Flow', 'Common');
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
deleted file mode 100644
index 21783f18e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/**
- * Abstract class for a set of proprietary modules that clean up (tidy)
- * poorly written HTML.
- * @todo Figure out how to protect some of these methods/properties
- */
-class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
-{
-
- /**
- * List of supported levels. Index zero is a special case "no fixes"
- * level.
- */
- public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
-
- /**
- * Default level to place all fixes in. Disabled by default
- */
- public $defaultLevel = null;
-
- /**
- * Lists of fixes used by getFixesForLevel(). Format is:
- * HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
- */
- public $fixesForLevel = array(
- 'light' => array(),
- 'medium' => array(),
- 'heavy' => array()
- );
-
- /**
- * Lazy load constructs the module by determining the necessary
- * fixes to create and then delegating to the populate() function.
- * @todo Wildcard matching and error reporting when an added or
- * subtracted fix has no effect.
- */
- public function setup($config) {
-
- // create fixes, initialize fixesForLevel
- $fixes = $this->makeFixes();
- $this->makeFixesForLevel($fixes);
-
- // figure out which fixes to use
- $level = $config->get('HTML.TidyLevel');
- $fixes_lookup = $this->getFixesForLevel($level);
-
- // get custom fix declarations: these need namespace processing
- $add_fixes = $config->get('HTML.TidyAdd');
- $remove_fixes = $config->get('HTML.TidyRemove');
-
- foreach ($fixes as $name => $fix) {
- // needs to be refactored a little to implement globbing
- if (
- isset($remove_fixes[$name]) ||
- (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))
- ) {
- unset($fixes[$name]);
- }
- }
-
- // populate this module with necessary fixes
- $this->populate($fixes);
-
- }
-
- /**
- * Retrieves all fixes per a level, returning fixes for that specific
- * level as well as all levels below it.
- * @param $level String level identifier, see $levels for valid values
- * @return Lookup up table of fixes
- */
- public function getFixesForLevel($level) {
- if ($level == $this->levels[0]) {
- return array();
- }
- $activated_levels = array();
- for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
- $activated_levels[] = $this->levels[$i];
- if ($this->levels[$i] == $level) break;
- }
- if ($i == $c) {
- trigger_error(
- 'Tidy level ' . htmlspecialchars($level) . ' not recognized',
- E_USER_WARNING
- );
- return array();
- }
- $ret = array();
- foreach ($activated_levels as $level) {
- foreach ($this->fixesForLevel[$level] as $fix) {
- $ret[$fix] = true;
- }
- }
- return $ret;
- }
-
- /**
- * Dynamically populates the $fixesForLevel member variable using
- * the fixes array. It may be custom overloaded, used in conjunction
- * with $defaultLevel, or not used at all.
- */
- public function makeFixesForLevel($fixes) {
- if (!isset($this->defaultLevel)) return;
- if (!isset($this->fixesForLevel[$this->defaultLevel])) {
- trigger_error(
- 'Default level ' . $this->defaultLevel . ' does not exist',
- E_USER_ERROR
- );
- return;
- }
- $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
- }
-
- /**
- * Populates the module with transforms and other special-case code
- * based on a list of fixes passed to it
- * @param $lookup Lookup table of fixes to activate
- */
- public function populate($fixes) {
- foreach ($fixes as $name => $fix) {
- // determine what the fix is for
- list($type, $params) = $this->getFixType($name);
- switch ($type) {
- case 'attr_transform_pre':
- case 'attr_transform_post':
- $attr = $params['attr'];
- if (isset($params['element'])) {
- $element = $params['element'];
- if (empty($this->info[$element])) {
- $e = $this->addBlankElement($element);
- } else {
- $e = $this->info[$element];
- }
- } else {
- $type = "info_$type";
- $e = $this;
- }
- // PHP does some weird parsing when I do
- // $e->$type[$attr], so I have to assign a ref.
- $f =& $e->$type;
- $f[$attr] = $fix;
- break;
- case 'tag_transform':
- $this->info_tag_transform[$params['element']] = $fix;
- break;
- case 'child':
- case 'content_model_type':
- $element = $params['element'];
- if (empty($this->info[$element])) {
- $e = $this->addBlankElement($element);
- } else {
- $e = $this->info[$element];
- }
- $e->$type = $fix;
- break;
- default:
- trigger_error("Fix type $type not supported", E_USER_ERROR);
- break;
- }
- }
- }
-
- /**
- * Parses a fix name and determines what kind of fix it is, as well
- * as other information defined by the fix
- * @param $name String name of fix
- * @return array(string $fix_type, array $fix_parameters)
- * @note $fix_parameters is type dependant, see populate() for usage
- * of these parameters
- */
- public function getFixType($name) {
- // parse it
- $property = $attr = null;
- if (strpos($name, '#') !== false) list($name, $property) = explode('#', $name);
- if (strpos($name, '@') !== false) list($name, $attr) = explode('@', $name);
-
- // figure out the parameters
- $params = array();
- if ($name !== '') $params['element'] = $name;
- if (!is_null($attr)) $params['attr'] = $attr;
-
- // special case: attribute transform
- if (!is_null($attr)) {
- if (is_null($property)) $property = 'pre';
- $type = 'attr_transform_' . $property;
- return array($type, $params);
- }
-
- // special case: tag transform
- if (is_null($property)) {
- return array('tag_transform', $params);
- }
-
- return array($property, $params);
-
- }
-
- /**
- * Defines all fixes the module will perform in a compact
- * associative array of fix name to fix implementation.
- */
- public function makeFixes() {}
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
deleted file mode 100644
index 61ff85ce2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Name is deprecated, but allowed in strict doctypes, so onl
- */
-class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
-{
- public $name = 'Tidy_Name';
- public $defaultLevel = 'heavy';
- public function makeFixes() {
-
- $r = array();
-
- // @name for img, a -----------------------------------------------
- // Technically, it's allowed even on strict, so we allow authors to use
- // it. However, it's deprecated in future versions of XHTML.
- $r['img@name'] =
- $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
-
- return $r;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
deleted file mode 100644
index 85fa90a94..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
-{
-
- public $name = 'Tidy_Proprietary';
- public $defaultLevel = 'light';
-
- public function makeFixes() {
- $r = array();
- $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['td@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['th@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['tr@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
- $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
- return $r;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
deleted file mode 100644
index c73dc3c4d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
- public $name = 'Tidy_Strict';
- public $defaultLevel = 'light';
-
- public function makeFixes() {
- $r = parent::makeFixes();
- $r['blockquote#content_model_type'] = 'strictblockquote';
- return $r;
- }
-
- public $defines_child_def = true;
- public function getChildDef($def) {
- if ($def->content_model_type != 'strictblockquote') return parent::getChildDef($def);
- return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
deleted file mode 100644
index 9960b1dd1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
- public $name = 'Tidy_Transitional';
- public $defaultLevel = 'heavy';
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
deleted file mode 100644
index db5a378e5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
-{
-
- public $name = 'Tidy_XHTML';
- public $defaultLevel = 'medium';
-
- public function makeFixes() {
- $r = array();
- $r['@lang'] = new HTMLPurifier_AttrTransform_Lang();
- return $r;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
deleted file mode 100644
index 02e943813..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
-{
-
- public function makeFixes() {
-
- $r = array();
-
- // == deprecated tag transforms ===================================
-
- $r['font'] = new HTMLPurifier_TagTransform_Font();
- $r['menu'] = new HTMLPurifier_TagTransform_Simple('ul');
- $r['dir'] = new HTMLPurifier_TagTransform_Simple('ul');
- $r['center'] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;');
- $r['u'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
- $r['s'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
- $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-
- // == deprecated attribute transforms =============================
-
- $r['caption@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
- // we're following IE's behavior, not Firefox's, due
- // to the fact that no one supports caption-side:right,
- // W3C included (with CSS 2.1). This is a slightly
- // unreasonable attribute!
- 'left' => 'text-align:left;',
- 'right' => 'text-align:right;',
- 'top' => 'caption-side:top;',
- 'bottom' => 'caption-side:bottom;' // not supported by IE
- ));
-
- // @align for img -------------------------------------------------
- $r['img@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
- 'left' => 'float:left;',
- 'right' => 'float:right;',
- 'top' => 'vertical-align:top;',
- 'middle' => 'vertical-align:middle;',
- 'bottom' => 'vertical-align:baseline;',
- ));
-
- // @align for table -----------------------------------------------
- $r['table@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
- 'left' => 'float:left;',
- 'center' => 'margin-left:auto;margin-right:auto;',
- 'right' => 'float:right;'
- ));
-
- // @align for hr -----------------------------------------------
- $r['hr@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
- // we use both text-align and margin because these work
- // for different browsers (IE and Firefox, respectively)
- // and the melange makes for a pretty cross-compatible
- // solution
- 'left' => 'margin-left:0;margin-right:auto;text-align:left;',
- 'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
- 'right' => 'margin-left:auto;margin-right:0;text-align:right;'
- ));
-
- // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
- // {{{
- $align_lookup = array();
- $align_values = array('left', 'right', 'center', 'justify');
- foreach ($align_values as $v) $align_lookup[$v] = "text-align:$v;";
- // }}}
- $r['h1@align'] =
- $r['h2@align'] =
- $r['h3@align'] =
- $r['h4@align'] =
- $r['h5@align'] =
- $r['h6@align'] =
- $r['p@align'] =
- $r['div@align'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
-
- // @bgcolor for table, tr, td, th ---------------------------------
- $r['table@bgcolor'] =
- $r['td@bgcolor'] =
- $r['th@bgcolor'] =
- new HTMLPurifier_AttrTransform_BgColor();
-
- // @border for img ------------------------------------------------
- $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
-
- // @clear for br --------------------------------------------------
- $r['br@clear'] =
- new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
- 'left' => 'clear:left;',
- 'right' => 'clear:right;',
- 'all' => 'clear:both;',
- 'none' => 'clear:none;',
- ));
-
- // @height for td, th ---------------------------------------------
- $r['td@height'] =
- $r['th@height'] =
- new HTMLPurifier_AttrTransform_Length('height');
-
- // @hspace for img ------------------------------------------------
- $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
-
- // @noshade for hr ------------------------------------------------
- // this transformation is not precise but often good enough.
- // different browsers use different styles to designate noshade
- $r['hr@noshade'] =
- new HTMLPurifier_AttrTransform_BoolToCSS(
- 'noshade',
- 'color:#808080;background-color:#808080;border:0;'
- );
-
- // @nowrap for td, th ---------------------------------------------
- $r['td@nowrap'] =
- $r['th@nowrap'] =
- new HTMLPurifier_AttrTransform_BoolToCSS(
- 'nowrap',
- 'white-space:nowrap;'
- );
-
- // @size for hr --------------------------------------------------
- $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
-
- // @type for li, ol, ul -------------------------------------------
- // {{{
- $ul_types = array(
- 'disc' => 'list-style-type:disc;',
- 'square' => 'list-style-type:square;',
- 'circle' => 'list-style-type:circle;'
- );
- $ol_types = array(
- '1' => 'list-style-type:decimal;',
- 'i' => 'list-style-type:lower-roman;',
- 'I' => 'list-style-type:upper-roman;',
- 'a' => 'list-style-type:lower-alpha;',
- 'A' => 'list-style-type:upper-alpha;'
- );
- $li_types = $ul_types + $ol_types;
- // }}}
-
- $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
- $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
- $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
-
- // @vspace for img ------------------------------------------------
- $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
-
- // @width for hr, td, th ------------------------------------------
- $r['td@width'] =
- $r['th@width'] =
- $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
-
- return $r;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
deleted file mode 100644
index 9c0e03198..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
- public $name = 'XMLCommonAttributes';
-
- public $attr_collections = array(
- 'Lang' => array(
- 'xml:lang' => 'LanguageCode',
- )
- );
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php b/extlib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
deleted file mode 100644
index f5c4a1d2c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModuleManager
-{
-
- /**
- * Instance of HTMLPurifier_DoctypeRegistry
- */
- public $doctypes;
-
- /**
- * Instance of current doctype
- */
- public $doctype;
-
- /**
- * Instance of HTMLPurifier_AttrTypes
- */
- public $attrTypes;
-
- /**
- * Active instances of modules for the specified doctype are
- * indexed, by name, in this array.
- */
- public $modules = array();
-
- /**
- * Array of recognized HTMLPurifier_Module instances, indexed by
- * module's class name. This array is usually lazy loaded, but a
- * user can overload a module by pre-emptively registering it.
- */
- public $registeredModules = array();
-
- /**
- * List of extra modules that were added by the user using addModule().
- * These get unconditionally merged into the current doctype, whatever
- * it may be.
- */
- public $userModules = array();
-
- /**
- * Associative array of element name to list of modules that have
- * definitions for the element; this array is dynamically filled.
- */
- public $elementLookup = array();
-
- /** List of prefixes we should use for registering small names */
- public $prefixes = array('HTMLPurifier_HTMLModule_');
-
- public $contentSets; /**< Instance of HTMLPurifier_ContentSets */
- public $attrCollections; /**< Instance of HTMLPurifier_AttrCollections */
-
- /** If set to true, unsafe elements and attributes will be allowed */
- public $trusted = false;
-
- public function __construct() {
-
- // editable internal objects
- $this->attrTypes = new HTMLPurifier_AttrTypes();
- $this->doctypes = new HTMLPurifier_DoctypeRegistry();
-
- // setup basic modules
- $common = array(
- 'CommonAttributes', 'Text', 'Hypertext', 'List',
- 'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
- 'StyleAttribute',
- // Unsafe:
- 'Scripting', 'Object', 'Forms',
- // Sorta legacy, but present in strict:
- 'Name',
- );
- $transitional = array('Legacy', 'Target');
- $xml = array('XMLCommonAttributes');
- $non_xml = array('NonXMLCommonAttributes');
-
- // setup basic doctypes
- $this->doctypes->register(
- 'HTML 4.01 Transitional', false,
- array_merge($common, $transitional, $non_xml),
- array('Tidy_Transitional', 'Tidy_Proprietary'),
- array(),
- '-//W3C//DTD HTML 4.01 Transitional//EN',
- 'http://www.w3.org/TR/html4/loose.dtd'
- );
-
- $this->doctypes->register(
- 'HTML 4.01 Strict', false,
- array_merge($common, $non_xml),
- array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
- array(),
- '-//W3C//DTD HTML 4.01//EN',
- 'http://www.w3.org/TR/html4/strict.dtd'
- );
-
- $this->doctypes->register(
- 'XHTML 1.0 Transitional', true,
- array_merge($common, $transitional, $xml, $non_xml),
- array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
- array(),
- '-//W3C//DTD XHTML 1.0 Transitional//EN',
- 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
- );
-
- $this->doctypes->register(
- 'XHTML 1.0 Strict', true,
- array_merge($common, $xml, $non_xml),
- array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
- array(),
- '-//W3C//DTD XHTML 1.0 Strict//EN',
- 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
- );
-
- $this->doctypes->register(
- 'XHTML 1.1', true,
- array_merge($common, $xml, array('Ruby')),
- array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
- array(),
- '-//W3C//DTD XHTML 1.1//EN',
- 'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
- );
-
- }
-
- /**
- * Registers a module to the recognized module list, useful for
- * overloading pre-existing modules.
- * @param $module Mixed: string module name, with or without
- * HTMLPurifier_HTMLModule prefix, or instance of
- * subclass of HTMLPurifier_HTMLModule.
- * @param $overload Boolean whether or not to overload previous modules.
- * If this is not set, and you do overload a module,
- * HTML Purifier will complain with a warning.
- * @note This function will not call autoload, you must instantiate
- * (and thus invoke) autoload outside the method.
- * @note If a string is passed as a module name, different variants
- * will be tested in this order:
- * - Check for HTMLPurifier_HTMLModule_$name
- * - Check all prefixes with $name in order they were added
- * - Check for literal object name
- * - Throw fatal error
- * If your object name collides with an internal class, specify
- * your module manually. All modules must have been included
- * externally: registerModule will not perform inclusions for you!
- */
- public function registerModule($module, $overload = false) {
- if (is_string($module)) {
- // attempt to load the module
- $original_module = $module;
- $ok = false;
- foreach ($this->prefixes as $prefix) {
- $module = $prefix . $original_module;
- if (class_exists($module)) {
- $ok = true;
- break;
- }
- }
- if (!$ok) {
- $module = $original_module;
- if (!class_exists($module)) {
- trigger_error($original_module . ' module does not exist',
- E_USER_ERROR);
- return;
- }
- }
- $module = new $module();
- }
- if (empty($module->name)) {
- trigger_error('Module instance of ' . get_class($module) . ' must have name');
- return;
- }
- if (!$overload && isset($this->registeredModules[$module->name])) {
- trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
- }
- $this->registeredModules[$module->name] = $module;
- }
-
- /**
- * Adds a module to the current doctype by first registering it,
- * and then tacking it on to the active doctype
- */
- public function addModule($module) {
- $this->registerModule($module);
- if (is_object($module)) $module = $module->name;
- $this->userModules[] = $module;
- }
-
- /**
- * Adds a class prefix that registerModule() will use to resolve a
- * string name to a concrete class
- */
- public function addPrefix($prefix) {
- $this->prefixes[] = $prefix;
- }
-
- /**
- * Performs processing on modules, after being called you may
- * use getElement() and getElements()
- * @param $config Instance of HTMLPurifier_Config
- */
- public function setup($config) {
-
- $this->trusted = $config->get('HTML.Trusted');
-
- // generate
- $this->doctype = $this->doctypes->make($config);
- $modules = $this->doctype->modules;
-
- // take out the default modules that aren't allowed
- $lookup = $config->get('HTML.AllowedModules');
- $special_cases = $config->get('HTML.CoreModules');
-
- if (is_array($lookup)) {
- foreach ($modules as $k => $m) {
- if (isset($special_cases[$m])) continue;
- if (!isset($lookup[$m])) unset($modules[$k]);
- }
- }
-
- // add proprietary module (this gets special treatment because
- // it is completely removed from doctypes, etc.)
- if ($config->get('HTML.Proprietary')) {
- $modules[] = 'Proprietary';
- }
-
- // add SafeObject/Safeembed modules
- if ($config->get('HTML.SafeObject')) {
- $modules[] = 'SafeObject';
- }
- if ($config->get('HTML.SafeEmbed')) {
- $modules[] = 'SafeEmbed';
- }
-
- // merge in custom modules
- $modules = array_merge($modules, $this->userModules);
-
- foreach ($modules as $module) {
- $this->processModule($module);
- $this->modules[$module]->setup($config);
- }
-
- foreach ($this->doctype->tidyModules as $module) {
- $this->processModule($module);
- $this->modules[$module]->setup($config);
- }
-
- // prepare any injectors
- foreach ($this->modules as $module) {
- $n = array();
- foreach ($module->info_injector as $i => $injector) {
- if (!is_object($injector)) {
- $class = "HTMLPurifier_Injector_$injector";
- $injector = new $class;
- }
- $n[$injector->name] = $injector;
- }
- $module->info_injector = $n;
- }
-
- // setup lookup table based on all valid modules
- foreach ($this->modules as $module) {
- foreach ($module->info as $name => $def) {
- if (!isset($this->elementLookup[$name])) {
- $this->elementLookup[$name] = array();
- }
- $this->elementLookup[$name][] = $module->name;
- }
- }
-
- // note the different choice
- $this->contentSets = new HTMLPurifier_ContentSets(
- // content set assembly deals with all possible modules,
- // not just ones deemed to be "safe"
- $this->modules
- );
- $this->attrCollections = new HTMLPurifier_AttrCollections(
- $this->attrTypes,
- // there is no way to directly disable a global attribute,
- // but using AllowedAttributes or simply not including
- // the module in your custom doctype should be sufficient
- $this->modules
- );
- }
-
- /**
- * Takes a module and adds it to the active module collection,
- * registering it if necessary.
- */
- public function processModule($module) {
- if (!isset($this->registeredModules[$module]) || is_object($module)) {
- $this->registerModule($module);
- }
- $this->modules[$module] = $this->registeredModules[$module];
- }
-
- /**
- * Retrieves merged element definitions.
- * @return Array of HTMLPurifier_ElementDef
- */
- public function getElements() {
-
- $elements = array();
- foreach ($this->modules as $module) {
- if (!$this->trusted && !$module->safe) continue;
- foreach ($module->info as $name => $v) {
- if (isset($elements[$name])) continue;
- $elements[$name] = $this->getElement($name);
- }
- }
-
- // remove dud elements, this happens when an element that
- // appeared to be safe actually wasn't
- foreach ($elements as $n => $v) {
- if ($v === false) unset($elements[$n]);
- }
-
- return $elements;
-
- }
-
- /**
- * Retrieves a single merged element definition
- * @param $name Name of element
- * @param $trusted Boolean trusted overriding parameter: set to true
- * if you want the full version of an element
- * @return Merged HTMLPurifier_ElementDef
- * @note You may notice that modules are getting iterated over twice (once
- * in getElements() and once here). This
- * is because
- */
- public function getElement($name, $trusted = null) {
-
- if (!isset($this->elementLookup[$name])) {
- return false;
- }
-
- // setup global state variables
- $def = false;
- if ($trusted === null) $trusted = $this->trusted;
-
- // iterate through each module that has registered itself to this
- // element
- foreach($this->elementLookup[$name] as $module_name) {
-
- $module = $this->modules[$module_name];
-
- // refuse to create/merge from a module that is deemed unsafe--
- // pretend the module doesn't exist--when trusted mode is not on.
- if (!$trusted && !$module->safe) {
- continue;
- }
-
- // clone is used because, ideally speaking, the original
- // definition should not be modified. Usually, this will
- // make no difference, but for consistency's sake
- $new_def = clone $module->info[$name];
-
- if (!$def && $new_def->standalone) {
- $def = $new_def;
- } elseif ($def) {
- // This will occur even if $new_def is standalone. In practice,
- // this will usually result in a full replacement.
- $def->mergeIn($new_def);
- } else {
- // :TODO:
- // non-standalone definitions that don't have a standalone
- // to merge into could be deferred to the end
- continue;
- }
-
- // attribute value expansions
- $this->attrCollections->performInclusions($def->attr);
- $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
-
- // descendants_are_inline, for ChildDef_Chameleon
- if (is_string($def->content_model) &&
- strpos($def->content_model, 'Inline') !== false) {
- if ($name != 'del' && $name != 'ins') {
- // this is for you, ins/del
- $def->descendants_are_inline = true;
- }
- }
-
- $this->contentSets->generateChildDef($def, $module);
- }
-
- // This can occur if there is a blank definition, but no base to
- // mix it in with
- if (!$def) return false;
-
- // add information on required attributes
- foreach ($def->attr as $attr_name => $attr_def) {
- if ($attr_def->required) {
- $def->required_attr[] = $attr_name;
- }
- }
-
- return $def;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/IDAccumulator.php b/extlib/HTMLPurifier/HTMLPurifier/IDAccumulator.php
deleted file mode 100644
index 73215295a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/IDAccumulator.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Component of HTMLPurifier_AttrContext that accumulates IDs to prevent dupes
- * @note In Slashdot-speak, dupe means duplicate.
- * @note The default constructor does not accept $config or $context objects:
- * use must use the static build() factory method to perform initialization.
- */
-class HTMLPurifier_IDAccumulator
-{
-
- /**
- * Lookup table of IDs we've accumulated.
- * @public
- */
- public $ids = array();
-
- /**
- * Builds an IDAccumulator, also initializing the default blacklist
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return Fully initialized HTMLPurifier_IDAccumulator
- */
- public static function build($config, $context) {
- $id_accumulator = new HTMLPurifier_IDAccumulator();
- $id_accumulator->load($config->get('Attr.IDBlacklist'));
- return $id_accumulator;
- }
-
- /**
- * Add an ID to the lookup table.
- * @param $id ID to be added.
- * @return Bool status, true if success, false if there's a dupe
- */
- public function add($id) {
- if (isset($this->ids[$id])) return false;
- return $this->ids[$id] = true;
- }
-
- /**
- * Load a list of IDs into the lookup table
- * @param $array_of_ids Array of IDs to load
- * @note This function doesn't care about duplicates
- */
- public function load($array_of_ids) {
- foreach ($array_of_ids as $id) {
- $this->ids[$id] = true;
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector.php b/extlib/HTMLPurifier/HTMLPurifier/Injector.php
deleted file mode 100644
index 5922f8130..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-/**
- * Injects tokens into the document while parsing for well-formedness.
- * This enables "formatter-like" functionality such as auto-paragraphing,
- * smiley-ification and linkification to take place.
- *
- * A note on how handlers create changes; this is done by assigning a new
- * value to the $token reference. These values can take a variety of forms and
- * are best described HTMLPurifier_Strategy_MakeWellFormed->processToken()
- * documentation.
- *
- * @todo Allow injectors to request a re-run on their output. This
- * would help if an operation is recursive.
- */
-abstract class HTMLPurifier_Injector
-{
-
- /**
- * Advisory name of injector, this is for friendly error messages
- */
- public $name;
-
- /**
- * Instance of HTMLPurifier_HTMLDefinition
- */
- protected $htmlDefinition;
-
- /**
- * Reference to CurrentNesting variable in Context. This is an array
- * list of tokens that we are currently "inside"
- */
- protected $currentNesting;
-
- /**
- * Reference to InputTokens variable in Context. This is an array
- * list of the input tokens that are being processed.
- */
- protected $inputTokens;
-
- /**
- * Reference to InputIndex variable in Context. This is an integer
- * array index for $this->inputTokens that indicates what token
- * is currently being processed.
- */
- protected $inputIndex;
-
- /**
- * Array of elements and attributes this injector creates and therefore
- * need to be allowed by the definition. Takes form of
- * array('element' => array('attr', 'attr2'), 'element2')
- */
- public $needed = array();
-
- /**
- * Index of inputTokens to rewind to.
- */
- protected $rewind = false;
-
- /**
- * Rewind to a spot to re-perform processing. This is useful if you
- * deleted a node, and now need to see if this change affected any
- * earlier nodes. Rewinding does not affect other injectors, and can
- * result in infinite loops if not used carefully.
- * @warning HTML Purifier will prevent you from fast-forwarding with this
- * function.
- */
- public function rewind($index) {
- $this->rewind = $index;
- }
-
- /**
- * Retrieves rewind, and then unsets it.
- */
- public function getRewind() {
- $r = $this->rewind;
- $this->rewind = false;
- return $r;
- }
-
- /**
- * Prepares the injector by giving it the config and context objects:
- * this allows references to important variables to be made within
- * the injector. This function also checks if the HTML environment
- * will work with the Injector (see checkNeeded()).
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return Boolean false if success, string of missing needed element/attribute if failure
- */
- public function prepare($config, $context) {
- $this->htmlDefinition = $config->getHTMLDefinition();
- // Even though this might fail, some unit tests ignore this and
- // still test checkNeeded, so be careful. Maybe get rid of that
- // dependency.
- $result = $this->checkNeeded($config);
- if ($result !== false) return $result;
- $this->currentNesting =& $context->get('CurrentNesting');
- $this->inputTokens =& $context->get('InputTokens');
- $this->inputIndex =& $context->get('InputIndex');
- return false;
- }
-
- /**
- * This function checks if the HTML environment
- * will work with the Injector: if p tags are not allowed, the
- * Auto-Paragraphing injector should not be enabled.
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return Boolean false if success, string of missing needed element/attribute if failure
- */
- public function checkNeeded($config) {
- $def = $config->getHTMLDefinition();
- foreach ($this->needed as $element => $attributes) {
- if (is_int($element)) $element = $attributes;
- if (!isset($def->info[$element])) return $element;
- if (!is_array($attributes)) continue;
- foreach ($attributes as $name) {
- if (!isset($def->info[$element]->attr[$name])) return "$element.$name";
- }
- }
- return false;
- }
-
- /**
- * Tests if the context node allows a certain element
- * @param $name Name of element to test for
- * @return True if element is allowed, false if it is not
- */
- public function allowsElement($name) {
- if (!empty($this->currentNesting)) {
- $parent_token = array_pop($this->currentNesting);
- $this->currentNesting[] = $parent_token;
- $parent = $this->htmlDefinition->info[$parent_token->name];
- } else {
- $parent = $this->htmlDefinition->info_parent_def;
- }
- if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
- return false;
- }
- // check for exclusion
- for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
- $node = $this->currentNesting[$i];
- $def = $this->htmlDefinition->info[$node->name];
- if (isset($def->excludes[$name])) return false;
- }
- return true;
- }
-
- /**
- * Iterator function, which starts with the next token and continues until
- * you reach the end of the input tokens.
- * @warning Please prevent previous references from interfering with this
- * functions by setting $i = null beforehand!
- * @param &$i Current integer index variable for inputTokens
- * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
- */
- protected function forward(&$i, &$current) {
- if ($i === null) $i = $this->inputIndex + 1;
- else $i++;
- if (!isset($this->inputTokens[$i])) return false;
- $current = $this->inputTokens[$i];
- return true;
- }
-
- /**
- * Similar to _forward, but accepts a third parameter $nesting (which
- * should be initialized at 0) and stops when we hit the end tag
- * for the node $this->inputIndex starts in.
- */
- protected function forwardUntilEndToken(&$i, &$current, &$nesting) {
- $result = $this->forward($i, $current);
- if (!$result) return false;
- if ($nesting === null) $nesting = 0;
- if ($current instanceof HTMLPurifier_Token_Start) $nesting++;
- elseif ($current instanceof HTMLPurifier_Token_End) {
- if ($nesting <= 0) return false;
- $nesting--;
- }
- return true;
- }
-
- /**
- * Iterator function, starts with the previous token and continues until
- * you reach the beginning of input tokens.
- * @warning Please prevent previous references from interfering with this
- * functions by setting $i = null beforehand!
- * @param &$i Current integer index variable for inputTokens
- * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
- */
- protected function backward(&$i, &$current) {
- if ($i === null) $i = $this->inputIndex - 1;
- else $i--;
- if ($i < 0) return false;
- $current = $this->inputTokens[$i];
- return true;
- }
-
- /**
- * Initializes the iterator at the current position. Use in a do {} while;
- * loop to force the _forward and _backward functions to start at the
- * current location.
- * @warning Please prevent previous references from interfering with this
- * functions by setting $i = null beforehand!
- * @param &$i Current integer index variable for inputTokens
- * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
- */
- protected function current(&$i, &$current) {
- if ($i === null) $i = $this->inputIndex;
- $current = $this->inputTokens[$i];
- }
-
- /**
- * Handler that is called when a text token is processed
- */
- public function handleText(&$token) {}
-
- /**
- * Handler that is called when a start or empty token is processed
- */
- public function handleElement(&$token) {}
-
- /**
- * Handler that is called when an end token is processed
- */
- public function handleEnd(&$token) {
- $this->notifyEnd($token);
- }
-
- /**
- * Notifier that is called when an end token is processed
- * @note This differs from handlers in that the token is read-only
- * @deprecated
- */
- public function notifyEnd($token) {}
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
deleted file mode 100644
index 8cc952549..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-
-/**
- * Injector that auto paragraphs text in the root node based on
- * double-spacing.
- * @todo Ensure all states are unit tested, including variations as well.
- * @todo Make a graph of the flow control for this Injector.
- */
-class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
-{
-
- public $name = 'AutoParagraph';
- public $needed = array('p');
-
- private function _pStart() {
- $par = new HTMLPurifier_Token_Start('p');
- $par->armor['MakeWellFormed_TagClosedError'] = true;
- return $par;
- }
-
- public function handleText(&$token) {
- $text = $token->data;
- // Does the current parent allow <p> tags?
- if ($this->allowsElement('p')) {
- if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
- // Note that we have differing behavior when dealing with text
- // in the anonymous root node, or a node inside the document.
- // If the text as a double-newline, the treatment is the same;
- // if it doesn't, see the next if-block if you're in the document.
-
- $i = $nesting = null;
- if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
- // State 1.1: ... ^ (whitespace, then document end)
- // ----
- // This is a degenerate case
- } else {
- // State 1.2: PAR1
- // ----
-
- // State 1.3: PAR1\n\nPAR2
- // ------------
-
- // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
- // ------------
- $token = array($this->_pStart());
- $this->_splitText($text, $token);
- }
- } else {
- // State 2: <div>PAR1... (similar to 1.4)
- // ----
-
- // We're in an element that allows paragraph tags, but we're not
- // sure if we're going to need them.
- if ($this->_pLookAhead()) {
- // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
- // ----
- // Note: This will always be the first child, since any
- // previous inline element would have triggered this very
- // same routine, and found the double newline. One possible
- // exception would be a comment.
- $token = array($this->_pStart(), $token);
- } else {
- // State 2.2.1: <div>PAR1<div>
- // ----
-
- // State 2.2.2: <div>PAR1<b>PAR1</b></div>
- // ----
- }
- }
- // Is the current parent a <p> tag?
- } elseif (
- !empty($this->currentNesting) &&
- $this->currentNesting[count($this->currentNesting)-1]->name == 'p'
- ) {
- // State 3.1: ...<p>PAR1
- // ----
-
- // State 3.2: ...<p>PAR1\n\nPAR2
- // ------------
- $token = array();
- $this->_splitText($text, $token);
- // Abort!
- } else {
- // State 4.1: ...<b>PAR1
- // ----
-
- // State 4.2: ...<b>PAR1\n\nPAR2
- // ------------
- }
- }
-
- public function handleElement(&$token) {
- // We don't have to check if we're already in a <p> tag for block
- // tokens, because the tag would have been autoclosed by MakeWellFormed.
- if ($this->allowsElement('p')) {
- if (!empty($this->currentNesting)) {
- if ($this->_isInline($token)) {
- // State 1: <div>...<b>
- // ---
-
- // Check if this token is adjacent to the parent token
- // (seek backwards until token isn't whitespace)
- $i = null;
- $this->backward($i, $prev);
-
- if (!$prev instanceof HTMLPurifier_Token_Start) {
- // Token wasn't adjacent
-
- if (
- $prev instanceof HTMLPurifier_Token_Text &&
- substr($prev->data, -2) === "\n\n"
- ) {
- // State 1.1.4: <div><p>PAR1</p>\n\n<b>
- // ---
-
- // Quite frankly, this should be handled by splitText
- $token = array($this->_pStart(), $token);
- } else {
- // State 1.1.1: <div><p>PAR1</p><b>
- // ---
-
- // State 1.1.2: <div><br /><b>
- // ---
-
- // State 1.1.3: <div>PAR<b>
- // ---
- }
-
- } else {
- // State 1.2.1: <div><b>
- // ---
-
- // Lookahead to see if <p> is needed.
- if ($this->_pLookAhead()) {
- // State 1.3.1: <div><b>PAR1\n\nPAR2
- // ---
- $token = array($this->_pStart(), $token);
- } else {
- // State 1.3.2: <div><b>PAR1</b></div>
- // ---
-
- // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
- // ---
- }
- }
- } else {
- // State 2.3: ...<div>
- // -----
- }
- } else {
- if ($this->_isInline($token)) {
- // State 3.1: <b>
- // ---
- // This is where the {p} tag is inserted, not reflected in
- // inputTokens yet, however.
- $token = array($this->_pStart(), $token);
- } else {
- // State 3.2: <div>
- // -----
- }
-
- $i = null;
- if ($this->backward($i, $prev)) {
- if (
- !$prev instanceof HTMLPurifier_Token_Text
- ) {
- // State 3.1.1: ...</p>{p}<b>
- // ---
-
- // State 3.2.1: ...</p><div>
- // -----
-
- if (!is_array($token)) $token = array($token);
- array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
- } else {
- // State 3.1.2: ...</p>\n\n{p}<b>
- // ---
-
- // State 3.2.2: ...</p>\n\n<div>
- // -----
-
- // Note: PAR<ELEM> cannot occur because PAR would have been
- // wrapped in <p> tags.
- }
- }
- }
- } else {
- // State 2.2: <ul><li>
- // ----
-
- // State 2.4: <p><b>
- // ---
- }
- }
-
- /**
- * Splits up a text in paragraph tokens and appends them
- * to the result stream that will replace the original
- * @param $data String text data that will be processed
- * into paragraphs
- * @param $result Reference to array of tokens that the
- * tags will be appended onto
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- */
- private function _splitText($data, &$result) {
- $raw_paragraphs = explode("\n\n", $data);
- $paragraphs = array(); // without empty paragraphs
- $needs_start = false;
- $needs_end = false;
-
- $c = count($raw_paragraphs);
- if ($c == 1) {
- // There were no double-newlines, abort quickly. In theory this
- // should never happen.
- $result[] = new HTMLPurifier_Token_Text($data);
- return;
- }
- for ($i = 0; $i < $c; $i++) {
- $par = $raw_paragraphs[$i];
- if (trim($par) !== '') {
- $paragraphs[] = $par;
- } else {
- if ($i == 0) {
- // Double newline at the front
- if (empty($result)) {
- // The empty result indicates that the AutoParagraph
- // injector did not add any start paragraph tokens.
- // This means that we have been in a paragraph for
- // a while, and the newline means we should start a new one.
- $result[] = new HTMLPurifier_Token_End('p');
- $result[] = new HTMLPurifier_Token_Text("\n\n");
- // However, the start token should only be added if
- // there is more processing to be done (i.e. there are
- // real paragraphs in here). If there are none, the
- // next start paragraph tag will be handled by the
- // next call to the injector
- $needs_start = true;
- } else {
- // We just started a new paragraph!
- // Reinstate a double-newline for presentation's sake, since
- // it was in the source code.
- array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
- }
- } elseif ($i + 1 == $c) {
- // Double newline at the end
- // There should be a trailing </p> when we're finally done.
- $needs_end = true;
- }
- }
- }
-
- // Check if this was just a giant blob of whitespace. Move this earlier,
- // perhaps?
- if (empty($paragraphs)) {
- return;
- }
-
- // Add the start tag indicated by \n\n at the beginning of $data
- if ($needs_start) {
- $result[] = $this->_pStart();
- }
-
- // Append the paragraphs onto the result
- foreach ($paragraphs as $par) {
- $result[] = new HTMLPurifier_Token_Text($par);
- $result[] = new HTMLPurifier_Token_End('p');
- $result[] = new HTMLPurifier_Token_Text("\n\n");
- $result[] = $this->_pStart();
- }
-
- // Remove trailing start token; Injector will handle this later if
- // it was indeed needed. This prevents from needing to do a lookahead,
- // at the cost of a lookbehind later.
- array_pop($result);
-
- // If there is no need for an end tag, remove all of it and let
- // MakeWellFormed close it later.
- if (!$needs_end) {
- array_pop($result); // removes \n\n
- array_pop($result); // removes </p>
- }
-
- }
-
- /**
- * Returns true if passed token is inline (and, ergo, allowed in
- * paragraph tags)
- */
- private function _isInline($token) {
- return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
- }
-
- /**
- * Looks ahead in the token list and determines whether or not we need
- * to insert a <p> tag.
- */
- private function _pLookAhead() {
- $this->current($i, $current);
- if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;
- else $nesting = 0;
- $ok = false;
- while ($this->forwardUntilEndToken($i, $current, $nesting)) {
- $result = $this->_checkNeedsP($current);
- if ($result !== null) {
- $ok = $result;
- break;
- }
- }
- return $ok;
- }
-
- /**
- * Determines if a particular token requires an earlier inline token
- * to get a paragraph. This should be used with _forwardUntilEndToken
- */
- private function _checkNeedsP($current) {
- if ($current instanceof HTMLPurifier_Token_Start){
- if (!$this->_isInline($current)) {
- // <div>PAR1<div>
- // ----
- // Terminate early, since we hit a block element
- return false;
- }
- } elseif ($current instanceof HTMLPurifier_Token_Text) {
- if (strpos($current->data, "\n\n") !== false) {
- // <div>PAR1<b>PAR1\n\nPAR2
- // ----
- return true;
- } else {
- // <div>PAR1<b>PAR1...
- // ----
- }
- }
- return null;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
deleted file mode 100644
index 9dce9bd08..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Injector that displays the URL of an anchor instead of linking to it, in addition to showing the text of the link.
- */
-class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
-{
-
- public $name = 'DisplayLinkURI';
- public $needed = array('a');
-
- public function handleElement(&$token) {
- }
-
- public function handleEnd(&$token) {
- if (isset($token->start->attr['href'])){
- $url = $token->start->attr['href'];
- unset($token->start->attr['href']);
- $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
- } else {
- // nothing to display
- }
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
deleted file mode 100644
index 296dac282..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Injector that converts http, https and ftp text URLs to actual links.
- */
-class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
-{
-
- public $name = 'Linkify';
- public $needed = array('a' => array('href'));
-
- public function handleText(&$token) {
- if (!$this->allowsElement('a')) return;
-
- if (strpos($token->data, '://') === false) {
- // our really quick heuristic failed, abort
- // this may not work so well if we want to match things like
- // "google.com", but then again, most people don't
- return;
- }
-
- // there is/are URL(s). Let's split the string:
- // Note: this regex is extremely permissive
- $bits = preg_split('#((?:https?|ftp)://[^\s\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-
- $token = array();
-
- // $i = index
- // $c = count
- // $l = is link
- for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
- if (!$l) {
- if ($bits[$i] === '') continue;
- $token[] = new HTMLPurifier_Token_Text($bits[$i]);
- } else {
- $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
- $token[] = new HTMLPurifier_Token_Text($bits[$i]);
- $token[] = new HTMLPurifier_Token_End('a');
- }
- }
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
deleted file mode 100644
index ad2455a91..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Injector that converts configuration directive syntax %Namespace.Directive
- * to links
- */
-class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
-{
-
- public $name = 'PurifierLinkify';
- public $docURL;
- public $needed = array('a' => array('href'));
-
- public function prepare($config, $context) {
- $this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
- return parent::prepare($config, $context);
- }
-
- public function handleText(&$token) {
- if (!$this->allowsElement('a')) return;
- if (strpos($token->data, '%') === false) return;
-
- $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
- $token = array();
-
- // $i = index
- // $c = count
- // $l = is link
- for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
- if (!$l) {
- if ($bits[$i] === '') continue;
- $token[] = new HTMLPurifier_Token_Text($bits[$i]);
- } else {
- $token[] = new HTMLPurifier_Token_Start('a',
- array('href' => str_replace('%s', $bits[$i], $this->docURL)));
- $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
- $token[] = new HTMLPurifier_Token_End('a');
- }
- }
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
deleted file mode 100644
index 638bfca03..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
-{
-
- private $context, $config, $attrValidator, $removeNbsp, $removeNbspExceptions;
-
- public function prepare($config, $context) {
- parent::prepare($config, $context);
- $this->config = $config;
- $this->context = $context;
- $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
- $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
- $this->attrValidator = new HTMLPurifier_AttrValidator();
- }
-
- public function handleElement(&$token) {
- if (!$token instanceof HTMLPurifier_Token_Start) return;
- $next = false;
- for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {
- $next = $this->inputTokens[$i];
- if ($next instanceof HTMLPurifier_Token_Text) {
- if ($next->is_whitespace) continue;
- if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
- $plain = str_replace("\xC2\xA0", "", $next->data);
- $isWsOrNbsp = $plain === '' || ctype_space($plain);
- if ($isWsOrNbsp) continue;
- }
- }
- break;
- }
- if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
- if ($token->name == 'colgroup') return;
- $this->attrValidator->validateToken($token, $this->config, $this->context);
- $token->armor['ValidateAttributes'] = true;
- if (isset($token->attr['id']) || isset($token->attr['name'])) return;
- $token = $i - $this->inputIndex + 1;
- for ($b = $this->inputIndex - 1; $b > 0; $b--) {
- $prev = $this->inputTokens[$b];
- if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) continue;
- break;
- }
- // This is safe because we removed the token that triggered this.
- $this->rewind($b - 1);
- return;
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
deleted file mode 100644
index 341582868..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Adds important param elements to inside of object in order to make
- * things safe.
- */
-class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
-{
- public $name = 'SafeObject';
- public $needed = array('object', 'param');
-
- protected $objectStack = array();
- protected $paramStack = array();
-
- // Keep this synchronized with AttrTransform/SafeParam.php
- protected $addParam = array(
- 'allowScriptAccess' => 'never',
- 'allowNetworking' => 'internal',
- );
- protected $allowedParam = array(
- 'wmode' => true,
- 'movie' => true,
- );
-
- public function prepare($config, $context) {
- parent::prepare($config, $context);
- }
-
- public function handleElement(&$token) {
- if ($token->name == 'object') {
- $this->objectStack[] = $token;
- $this->paramStack[] = array();
- $new = array($token);
- foreach ($this->addParam as $name => $value) {
- $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
- }
- $token = $new;
- } elseif ($token->name == 'param') {
- $nest = count($this->currentNesting) - 1;
- if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
- $i = count($this->objectStack) - 1;
- if (!isset($token->attr['name'])) {
- $token = false;
- return;
- }
- $n = $token->attr['name'];
- // We need this fix because YouTube doesn't supply a data
- // attribute, which we need if a type is specified. This is
- // *very* Flash specific.
- if (!isset($this->objectStack[$i]->attr['data']) && $token->attr['name'] == 'movie') {
- $this->objectStack[$i]->attr['data'] = $token->attr['value'];
- }
- // Check if the parameter is the correct value but has not
- // already been added
- if (
- !isset($this->paramStack[$i][$n]) &&
- isset($this->addParam[$n]) &&
- $token->attr['name'] === $this->addParam[$n]
- ) {
- // keep token, and add to param stack
- $this->paramStack[$i][$n] = true;
- } elseif (isset($this->allowedParam[$n])) {
- // keep token, don't do anything to it
- // (could possibly check for duplicates here)
- } else {
- $token = false;
- }
- } else {
- // not directly inside an object, DENY!
- $token = false;
- }
- }
- }
-
- public function handleEnd(&$token) {
- // This is the WRONG way of handling the object and param stacks;
- // we should be inserting them directly on the relevant object tokens
- // so that the global stack handling handles it.
- if ($token->name == 'object') {
- array_pop($this->objectStack);
- array_pop($this->paramStack);
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Language.php b/extlib/HTMLPurifier/HTMLPurifier/Language.php
deleted file mode 100644
index 3e2be03b5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Language.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/**
- * Represents a language and defines localizable string formatting and
- * other functions, as well as the localized messages for HTML Purifier.
- */
-class HTMLPurifier_Language
-{
-
- /**
- * ISO 639 language code of language. Prefers shortest possible version
- */
- public $code = 'en';
-
- /**
- * Fallback language code
- */
- public $fallback = false;
-
- /**
- * Array of localizable messages
- */
- public $messages = array();
-
- /**
- * Array of localizable error codes
- */
- public $errorNames = array();
-
- /**
- * True if no message file was found for this language, so English
- * is being used instead. Check this if you'd like to notify the
- * user that they've used a non-supported language.
- */
- public $error = false;
-
- /**
- * Has the language object been loaded yet?
- * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
- */
- public $_loaded = false;
-
- /**
- * Instances of HTMLPurifier_Config and HTMLPurifier_Context
- */
- protected $config, $context;
-
- public function __construct($config, $context) {
- $this->config = $config;
- $this->context = $context;
- }
-
- /**
- * Loads language object with necessary info from factory cache
- * @note This is a lazy loader
- */
- public function load() {
- if ($this->_loaded) return;
- $factory = HTMLPurifier_LanguageFactory::instance();
- $factory->loadLanguage($this->code);
- foreach ($factory->keys as $key) {
- $this->$key = $factory->cache[$this->code][$key];
- }
- $this->_loaded = true;
- }
-
- /**
- * Retrieves a localised message.
- * @param $key string identifier of message
- * @return string localised message
- */
- public function getMessage($key) {
- if (!$this->_loaded) $this->load();
- if (!isset($this->messages[$key])) return "[$key]";
- return $this->messages[$key];
- }
-
- /**
- * Retrieves a localised error name.
- * @param $int integer error number, corresponding to PHP's error
- * reporting
- * @return string localised message
- */
- public function getErrorName($int) {
- if (!$this->_loaded) $this->load();
- if (!isset($this->errorNames[$int])) return "[Error: $int]";
- return $this->errorNames[$int];
- }
-
- /**
- * Converts an array list into a string readable representation
- */
- public function listify($array) {
- $sep = $this->getMessage('Item separator');
- $sep_last = $this->getMessage('Item separator last');
- $ret = '';
- for ($i = 0, $c = count($array); $i < $c; $i++) {
- if ($i == 0) {
- } elseif ($i + 1 < $c) {
- $ret .= $sep;
- } else {
- $ret .= $sep_last;
- }
- $ret .= $array[$i];
- }
- return $ret;
- }
-
- /**
- * Formats a localised message with passed parameters
- * @param $key string identifier of message
- * @param $args Parameters to substitute in
- * @return string localised message
- * @todo Implement conditionals? Right now, some messages make
- * reference to line numbers, but those aren't always available
- */
- public function formatMessage($key, $args = array()) {
- if (!$this->_loaded) $this->load();
- if (!isset($this->messages[$key])) return "[$key]";
- $raw = $this->messages[$key];
- $subst = array();
- $generator = false;
- foreach ($args as $i => $value) {
- if (is_object($value)) {
- if ($value instanceof HTMLPurifier_Token) {
- // factor this out some time
- if (!$generator) $generator = $this->context->get('Generator');
- if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
- if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
- $subst['$'.$i.'.Compact'] =
- $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
- // a more complex algorithm for compact representation
- // could be introduced for all types of tokens. This
- // may need to be factored out into a dedicated class
- if (!empty($value->attr)) {
- $stripped_token = clone $value;
- $stripped_token->attr = array();
- $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
- }
- $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
- }
- continue;
- } elseif (is_array($value)) {
- $keys = array_keys($value);
- if (array_keys($keys) === $keys) {
- // list
- $subst['$'.$i] = $this->listify($value);
- } else {
- // associative array
- // no $i implementation yet, sorry
- $subst['$'.$i.'.Keys'] = $this->listify($keys);
- $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
- }
- continue;
- }
- $subst['$' . $i] = $value;
- }
- return strtr($raw, $subst);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php b/extlib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
deleted file mode 100644
index d52fcb7ac..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// private class for unit testing
-
-class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language
-{
-
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php b/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
deleted file mode 100644
index 1c046f379..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// private language message file for unit testing purposes
-
-$fallback = 'en';
-
-$messages = array(
- 'HTMLPurifier' => 'HTML Purifier X'
-);
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php b/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
deleted file mode 100644
index 806c83fbf..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// private language message file for unit testing purposes
-// this language file has no class associated with it
-
-$fallback = 'en';
-
-$messages = array(
- 'HTMLPurifier' => 'HTML Purifier XNone'
-);
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en.php b/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en.php
deleted file mode 100644
index aab2e52eb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Language/messages/en.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-$fallback = false;
-
-$messages = array(
-
-'HTMLPurifier' => 'HTML Purifier',
-
-// for unit testing purposes
-'LanguageFactoryTest: Pizza' => 'Pizza',
-'LanguageTest: List' => '$1',
-'LanguageTest: Hash' => '$1.Keys; $1.Values',
-
-'Item separator' => ', ',
-'Item separator last' => ' and ', // non-Harvard style
-
-'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
-'ErrorCollector: At line' => ' at line $line',
-'ErrorCollector: Incidental errors' => 'Incidental errors',
-
-'Lexer: Unclosed comment' => 'Unclosed comment',
-'Lexer: Unescaped lt' => 'Unescaped less-than sign (<) should be &lt;',
-'Lexer: Missing gt' => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
-'Lexer: Missing attribute key' => 'Attribute declaration has no key',
-'Lexer: Missing end quote' => 'Attribute declaration has no end quote',
-
-'Strategy_RemoveForeignElements: Tag transform' => '<$1> element transformed into $CurrentToken.Serialized',
-'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
-'Strategy_RemoveForeignElements: Foreign element to text' => 'Unrecognized $CurrentToken.Serialized tag converted to text',
-'Strategy_RemoveForeignElements: Foreign element removed' => 'Unrecognized $CurrentToken.Serialized tag removed',
-'Strategy_RemoveForeignElements: Comment removed' => 'Comment containing "$CurrentToken.Data" removed',
-'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
-'Strategy_RemoveForeignElements: Token removed to end' => 'Tags and text starting from $1 element where removed to end',
-'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
-'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
-
-'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
-'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
-'Strategy_MakeWellFormed: Tag auto closed' => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
-'Strategy_MakeWellFormed: Tag carryover' => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
-'Strategy_MakeWellFormed: Stray end tag removed' => 'Stray $CurrentToken.Serialized tag removed',
-'Strategy_MakeWellFormed: Stray end tag to text' => 'Stray $CurrentToken.Serialized tag converted to text',
-'Strategy_MakeWellFormed: Tag closed by element end' => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
-'Strategy_MakeWellFormed: Tag closed by document end' => '$1.Compact tag started on line $1.Line closed by end of document',
-
-'Strategy_FixNesting: Node removed' => '$CurrentToken.Compact node removed',
-'Strategy_FixNesting: Node excluded' => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
-'Strategy_FixNesting: Node reorganized' => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
-'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
-
-'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
-'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
-
-);
-
-$errorNames = array(
- E_ERROR => 'Error',
- E_WARNING => 'Warning',
- E_NOTICE => 'Notice'
-);
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/LanguageFactory.php b/extlib/HTMLPurifier/HTMLPurifier/LanguageFactory.php
deleted file mode 100644
index 134ef8c74..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/LanguageFactory.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * Class responsible for generating HTMLPurifier_Language objects, managing
- * caching and fallbacks.
- * @note Thanks to MediaWiki for the general logic, although this version
- * has been entirely rewritten
- * @todo Serialized cache for languages
- */
-class HTMLPurifier_LanguageFactory
-{
-
- /**
- * Cache of language code information used to load HTMLPurifier_Language objects
- * Structure is: $factory->cache[$language_code][$key] = $value
- * @value array map
- */
- public $cache;
-
- /**
- * Valid keys in the HTMLPurifier_Language object. Designates which
- * variables to slurp out of a message file.
- * @value array list
- */
- public $keys = array('fallback', 'messages', 'errorNames');
-
- /**
- * Instance of HTMLPurifier_AttrDef_Lang to validate language codes
- * @value object HTMLPurifier_AttrDef_Lang
- */
- protected $validator;
-
- /**
- * Cached copy of dirname(__FILE__), directory of current file without
- * trailing slash
- * @value string filename
- */
- protected $dir;
-
- /**
- * Keys whose contents are a hash map and can be merged
- * @value array lookup
- */
- protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
-
- /**
- * Keys whose contents are a list and can be merged
- * @value array lookup
- */
- protected $mergeable_keys_list = array();
-
- /**
- * Retrieve sole instance of the factory.
- * @param $prototype Optional prototype to overload sole instance with,
- * or bool true to reset to default factory.
- */
- public static function instance($prototype = null) {
- static $instance = null;
- if ($prototype !== null) {
- $instance = $prototype;
- } elseif ($instance === null || $prototype == true) {
- $instance = new HTMLPurifier_LanguageFactory();
- $instance->setup();
- }
- return $instance;
- }
-
- /**
- * Sets up the singleton, much like a constructor
- * @note Prevents people from getting this outside of the singleton
- */
- public function setup() {
- $this->validator = new HTMLPurifier_AttrDef_Lang();
- $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
- }
-
- /**
- * Creates a language object, handles class fallbacks
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @param $code Code to override configuration with. Private parameter.
- */
- public function create($config, $context, $code = false) {
-
- // validate language code
- if ($code === false) {
- $code = $this->validator->validate(
- $config->get('Core.Language'), $config, $context
- );
- } else {
- $code = $this->validator->validate($code, $config, $context);
- }
- if ($code === false) $code = 'en'; // malformed code becomes English
-
- $pcode = str_replace('-', '_', $code); // make valid PHP classname
- static $depth = 0; // recursion protection
-
- if ($code == 'en') {
- $lang = new HTMLPurifier_Language($config, $context);
- } else {
- $class = 'HTMLPurifier_Language_' . $pcode;
- $file = $this->dir . '/Language/classes/' . $code . '.php';
- if (file_exists($file) || class_exists($class, false)) {
- $lang = new $class($config, $context);
- } else {
- // Go fallback
- $raw_fallback = $this->getFallbackFor($code);
- $fallback = $raw_fallback ? $raw_fallback : 'en';
- $depth++;
- $lang = $this->create($config, $context, $fallback);
- if (!$raw_fallback) {
- $lang->error = true;
- }
- $depth--;
- }
- }
-
- $lang->code = $code;
-
- return $lang;
-
- }
-
- /**
- * Returns the fallback language for language
- * @note Loads the original language into cache
- * @param $code string language code
- */
- public function getFallbackFor($code) {
- $this->loadLanguage($code);
- return $this->cache[$code]['fallback'];
- }
-
- /**
- * Loads language into the cache, handles message file and fallbacks
- * @param $code string language code
- */
- public function loadLanguage($code) {
- static $languages_seen = array(); // recursion guard
-
- // abort if we've already loaded it
- if (isset($this->cache[$code])) return;
-
- // generate filename
- $filename = $this->dir . '/Language/messages/' . $code . '.php';
-
- // default fallback : may be overwritten by the ensuing include
- $fallback = ($code != 'en') ? 'en' : false;
-
- // load primary localisation
- if (!file_exists($filename)) {
- // skip the include: will rely solely on fallback
- $filename = $this->dir . '/Language/messages/en.php';
- $cache = array();
- } else {
- include $filename;
- $cache = compact($this->keys);
- }
-
- // load fallback localisation
- if (!empty($fallback)) {
-
- // infinite recursion guard
- if (isset($languages_seen[$code])) {
- trigger_error('Circular fallback reference in language ' .
- $code, E_USER_ERROR);
- $fallback = 'en';
- }
- $language_seen[$code] = true;
-
- // load the fallback recursively
- $this->loadLanguage($fallback);
- $fallback_cache = $this->cache[$fallback];
-
- // merge fallback with current language
- foreach ( $this->keys as $key ) {
- if (isset($cache[$key]) && isset($fallback_cache[$key])) {
- if (isset($this->mergeable_keys_map[$key])) {
- $cache[$key] = $cache[$key] + $fallback_cache[$key];
- } elseif (isset($this->mergeable_keys_list[$key])) {
- $cache[$key] = array_merge( $fallback_cache[$key], $cache[$key] );
- }
- } else {
- $cache[$key] = $fallback_cache[$key];
- }
- }
-
- }
-
- // save to cache for later retrieval
- $this->cache[$code] = $cache;
-
- return;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Length.php b/extlib/HTMLPurifier/HTMLPurifier/Length.php
deleted file mode 100644
index 8d2a46b7d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Length.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Represents a measurable length, with a string numeric magnitude
- * and a unit. This object is immutable.
- */
-class HTMLPurifier_Length
-{
-
- /**
- * String numeric magnitude.
- */
- protected $n;
-
- /**
- * String unit. False is permitted if $n = 0.
- */
- protected $unit;
-
- /**
- * Whether or not this length is valid. Null if not calculated yet.
- */
- protected $isValid;
-
- /**
- * Lookup array of units recognized by CSS 2.1
- */
- protected static $allowedUnits = array(
- 'em' => true, 'ex' => true, 'px' => true, 'in' => true,
- 'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
- );
-
- /**
- * @param number $n Magnitude
- * @param string $u Unit
- */
- public function __construct($n = '0', $u = false) {
- $this->n = (string) $n;
- $this->unit = $u !== false ? (string) $u : false;
- }
-
- /**
- * @param string $s Unit string, like '2em' or '3.4in'
- * @warning Does not perform validation.
- */
- static public function make($s) {
- if ($s instanceof HTMLPurifier_Length) return $s;
- $n_length = strspn($s, '1234567890.+-');
- $n = substr($s, 0, $n_length);
- $unit = substr($s, $n_length);
- if ($unit === '') $unit = false;
- return new HTMLPurifier_Length($n, $unit);
- }
-
- /**
- * Validates the number and unit.
- */
- protected function validate() {
- // Special case:
- if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
- if ($this->n === '0' && $this->unit === false) return true;
- if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
- if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
- // Hack:
- $def = new HTMLPurifier_AttrDef_CSS_Number();
- $result = $def->validate($this->n, false, false);
- if ($result === false) return false;
- $this->n = $result;
- return true;
- }
-
- /**
- * Returns string representation of number.
- */
- public function toString() {
- if (!$this->isValid()) return false;
- return $this->n . $this->unit;
- }
-
- /**
- * Retrieves string numeric magnitude.
- */
- public function getN() {return $this->n;}
-
- /**
- * Retrieves string unit.
- */
- public function getUnit() {return $this->unit;}
-
- /**
- * Returns true if this length unit is valid.
- */
- public function isValid() {
- if ($this->isValid === null) $this->isValid = $this->validate();
- return $this->isValid;
- }
-
- /**
- * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
- * @warning If both values are too large or small, this calculation will
- * not work properly
- */
- public function compareTo($l) {
- if ($l === false) return false;
- if ($l->unit !== $this->unit) {
- $converter = new HTMLPurifier_UnitConverter();
- $l = $converter->convert($l, $this->unit);
- if ($l === false) return false;
- }
- return $this->n - $l->n;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Lexer.php b/extlib/HTMLPurifier/HTMLPurifier/Lexer.php
deleted file mode 100644
index 8cce008d3..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Lexer.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-/**
- * Forgivingly lexes HTML (SGML-style) markup into tokens.
- *
- * A lexer parses a string of SGML-style markup and converts them into
- * corresponding tokens. It doesn't check for well-formedness, although its
- * internal mechanism may make this automatic (such as the case of
- * HTMLPurifier_Lexer_DOMLex). There are several implementations to choose
- * from.
- *
- * A lexer is HTML-oriented: it might work with XML, but it's not
- * recommended, as we adhere to a subset of the specification for optimization
- * reasons. This might change in the future. Also, most tokenizers are not
- * expected to handle DTDs or PIs.
- *
- * This class should not be directly instantiated, but you may use create() to
- * retrieve a default copy of the lexer. Being a supertype, this class
- * does not actually define any implementation, but offers commonly used
- * convenience functions for subclasses.
- *
- * @note The unit tests will instantiate this class for testing purposes, as
- * many of the utility functions require a class to be instantiated.
- * This means that, even though this class is not runnable, it will
- * not be declared abstract.
- *
- * @par
- *
- * @note
- * We use tokens rather than create a DOM representation because DOM would:
- *
- * @par
- * -# Require more processing and memory to create,
- * -# Is not streamable, and
- * -# Has the entire document structure (html and body not needed).
- *
- * @par
- * However, DOM is helpful in that it makes it easy to move around nodes
- * without a lot of lookaheads to see when a tag is closed. This is a
- * limitation of the token system and some workarounds would be nice.
- */
-class HTMLPurifier_Lexer
-{
-
- /**
- * Whether or not this lexer implements line-number/column-number tracking.
- * If it does, set to true.
- */
- public $tracksLineNumbers = false;
-
- // -- STATIC ----------------------------------------------------------
-
- /**
- * Retrieves or sets the default Lexer as a Prototype Factory.
- *
- * By default HTMLPurifier_Lexer_DOMLex will be returned. There are
- * a few exceptions involving special features that only DirectLex
- * implements.
- *
- * @note The behavior of this class has changed, rather than accepting
- * a prototype object, it now accepts a configuration object.
- * To specify your own prototype, set %Core.LexerImpl to it.
- * This change in behavior de-singletonizes the lexer object.
- *
- * @param $config Instance of HTMLPurifier_Config
- * @return Concrete lexer.
- */
- public static function create($config) {
-
- if (!($config instanceof HTMLPurifier_Config)) {
- $lexer = $config;
- trigger_error("Passing a prototype to
- HTMLPurifier_Lexer::create() is deprecated, please instead
- use %Core.LexerImpl", E_USER_WARNING);
- } else {
- $lexer = $config->get('Core.LexerImpl');
- }
-
- $needs_tracking =
- $config->get('Core.MaintainLineNumbers') ||
- $config->get('Core.CollectErrors');
-
- $inst = null;
- if (is_object($lexer)) {
- $inst = $lexer;
- } else {
-
- if (is_null($lexer)) { do {
- // auto-detection algorithm
-
- if ($needs_tracking) {
- $lexer = 'DirectLex';
- break;
- }
-
- if (
- class_exists('DOMDocument') &&
- method_exists('DOMDocument', 'loadHTML') &&
- !extension_loaded('domxml')
- ) {
- // check for DOM support, because while it's part of the
- // core, it can be disabled compile time. Also, the PECL
- // domxml extension overrides the default DOM, and is evil
- // and nasty and we shan't bother to support it
- $lexer = 'DOMLex';
- } else {
- $lexer = 'DirectLex';
- }
-
- } while(0); } // do..while so we can break
-
- // instantiate recognized string names
- switch ($lexer) {
- case 'DOMLex':
- $inst = new HTMLPurifier_Lexer_DOMLex();
- break;
- case 'DirectLex':
- $inst = new HTMLPurifier_Lexer_DirectLex();
- break;
- case 'PH5P':
- $inst = new HTMLPurifier_Lexer_PH5P();
- break;
- default:
- throw new HTMLPurifier_Exception("Cannot instantiate unrecognized Lexer type " . htmlspecialchars($lexer));
- }
- }
-
- if (!$inst) throw new HTMLPurifier_Exception('No lexer was instantiated');
-
- // once PHP DOM implements native line numbers, or we
- // hack out something using XSLT, remove this stipulation
- if ($needs_tracking && !$inst->tracksLineNumbers) {
- throw new HTMLPurifier_Exception('Cannot use lexer that does not support line numbers with Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)');
- }
-
- return $inst;
-
- }
-
- // -- CONVENIENCE MEMBERS ---------------------------------------------
-
- public function __construct() {
- $this->_entity_parser = new HTMLPurifier_EntityParser();
- }
-
- /**
- * Most common entity to raw value conversion table for special entities.
- */
- protected $_special_entity2str =
- array(
- '&quot;' => '"',
- '&amp;' => '&',
- '&lt;' => '<',
- '&gt;' => '>',
- '&#39;' => "'",
- '&#039;' => "'",
- '&#x27;' => "'"
- );
-
- /**
- * Parses special entities into the proper characters.
- *
- * This string will translate escaped versions of the special characters
- * into the correct ones.
- *
- * @warning
- * You should be able to treat the output of this function as
- * completely parsed, but that's only because all other entities should
- * have been handled previously in substituteNonSpecialEntities()
- *
- * @param $string String character data to be parsed.
- * @returns Parsed character data.
- */
- public function parseData($string) {
-
- // following functions require at least one character
- if ($string === '') return '';
-
- // subtracts amps that cannot possibly be escaped
- $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
- ($string[strlen($string)-1] === '&' ? 1 : 0);
-
- if (!$num_amp) return $string; // abort if no entities
- $num_esc_amp = substr_count($string, '&amp;');
- $string = strtr($string, $this->_special_entity2str);
-
- // code duplication for sake of optimization, see above
- $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
- ($string[strlen($string)-1] === '&' ? 1 : 0);
-
- if ($num_amp_2 <= $num_esc_amp) return $string;
-
- // hmm... now we have some uncommon entities. Use the callback.
- $string = $this->_entity_parser->substituteSpecialEntities($string);
- return $string;
- }
-
- /**
- * Lexes an HTML string into tokens.
- *
- * @param $string String HTML.
- * @return HTMLPurifier_Token array representation of HTML.
- */
- public function tokenizeHTML($string, $config, $context) {
- trigger_error('Call to abstract class', E_USER_ERROR);
- }
-
- /**
- * Translates CDATA sections into regular sections (through escaping).
- *
- * @param $string HTML string to process.
- * @returns HTML with CDATA sections escaped.
- */
- protected static function escapeCDATA($string) {
- return preg_replace_callback(
- '/<!\[CDATA\[(.+?)\]\]>/s',
- array('HTMLPurifier_Lexer', 'CDATACallback'),
- $string
- );
- }
-
- /**
- * Special CDATA case that is especially convoluted for <script>
- */
- protected static function escapeCommentedCDATA($string) {
- return preg_replace_callback(
- '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
- array('HTMLPurifier_Lexer', 'CDATACallback'),
- $string
- );
- }
-
- /**
- * Callback function for escapeCDATA() that does the work.
- *
- * @warning Though this is public in order to let the callback happen,
- * calling it directly is not recommended.
- * @params $matches PCRE matches array, with index 0 the entire match
- * and 1 the inside of the CDATA section.
- * @returns Escaped internals of the CDATA section.
- */
- protected static function CDATACallback($matches) {
- // not exactly sure why the character set is needed, but whatever
- return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
- }
-
- /**
- * Takes a piece of HTML and normalizes it by converting entities, fixing
- * encoding, extracting bits, and other good stuff.
- * @todo Consider making protected
- */
- public function normalize($html, $config, $context) {
-
- // normalize newlines to \n
- $html = str_replace("\r\n", "\n", $html);
- $html = str_replace("\r", "\n", $html);
-
- if ($config->get('HTML.Trusted')) {
- // escape convoluted CDATA
- $html = $this->escapeCommentedCDATA($html);
- }
-
- // escape CDATA
- $html = $this->escapeCDATA($html);
-
- // extract body from document if applicable
- if ($config->get('Core.ConvertDocumentToFragment')) {
- $html = $this->extractBody($html);
- }
-
- // expand entities that aren't the big five
- $html = $this->_entity_parser->substituteNonSpecialEntities($html);
-
- // clean into wellformed UTF-8 string for an SGML context: this has
- // to be done after entity expansion because the entities sometimes
- // represent non-SGML characters (horror, horror!)
- $html = HTMLPurifier_Encoder::cleanUTF8($html);
-
- return $html;
- }
-
- /**
- * Takes a string of HTML (fragment or document) and returns the content
- * @todo Consider making protected
- */
- public function extractBody($html) {
- $matches = array();
- $result = preg_match('!<body[^>]*>(.*)</body>!is', $html, $matches);
- if ($result) {
- return $matches[1];
- } else {
- return $html;
- }
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php b/extlib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
deleted file mode 100644
index 20dc2ed48..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-/**
- * Parser that uses PHP 5's DOM extension (part of the core).
- *
- * In PHP 5, the DOM XML extension was revamped into DOM and added to the core.
- * It gives us a forgiving HTML parser, which we use to transform the HTML
- * into a DOM, and then into the tokens. It is blazingly fast (for large
- * documents, it performs twenty times faster than
- * HTMLPurifier_Lexer_DirectLex,and is the default choice for PHP 5.
- *
- * @note Any empty elements will have empty tokens associated with them, even if
- * this is prohibited by the spec. This is cannot be fixed until the spec
- * comes into play.
- *
- * @note PHP's DOM extension does not actually parse any entities, we use
- * our own function to do that.
- *
- * @warning DOM tends to drop whitespace, which may wreak havoc on indenting.
- * If this is a huge problem, due to the fact that HTML is hand
- * edited and you are unable to get a parser cache that caches the
- * the output of HTML Purifier while keeping the original HTML lying
- * around, you may want to run Tidy on the resulting output or use
- * HTMLPurifier_DirectLex
- */
-
-class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
-{
-
- private $factory;
-
- public function __construct() {
- // setup the factory
- parent::__construct();
- $this->factory = new HTMLPurifier_TokenFactory();
- }
-
- public function tokenizeHTML($html, $config, $context) {
-
- $html = $this->normalize($html, $config, $context);
-
- // attempt to armor stray angled brackets that cannot possibly
- // form tags and thus are probably being used as emoticons
- if ($config->get('Core.AggressivelyFixLt')) {
- $char = '[^a-z!\/]';
- $comment = "/<!--(.*?)(-->|\z)/is";
- $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
- do {
- $old = $html;
- $html = preg_replace("/<($char)/i", '&lt;\\1', $html);
- } while ($html !== $old);
- $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
- }
-
- // preprocess html, essential for UTF-8
- $html = $this->wrapHTML($html, $config, $context);
-
- $doc = new DOMDocument();
- $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
-
- set_error_handler(array($this, 'muteErrorHandler'));
- $doc->loadHTML($html);
- restore_error_handler();
-
- $tokens = array();
- $this->tokenizeDOM(
- $doc->getElementsByTagName('html')->item(0)-> // <html>
- getElementsByTagName('body')->item(0)-> // <body>
- getElementsByTagName('div')->item(0) // <div>
- , $tokens);
- return $tokens;
- }
-
- /**
- * Recursive function that tokenizes a node, putting it into an accumulator.
- *
- * @param $node DOMNode to be tokenized.
- * @param $tokens Array-list of already tokenized tokens.
- * @param $collect Says whether or start and close are collected, set to
- * false at first recursion because it's the implicit DIV
- * tag you're dealing with.
- * @returns Tokens of node appended to previously passed tokens.
- */
- protected function tokenizeDOM($node, &$tokens, $collect = false) {
-
- // intercept non element nodes. WE MUST catch all of them,
- // but we're not getting the character reference nodes because
- // those should have been preprocessed
- if ($node->nodeType === XML_TEXT_NODE) {
- $tokens[] = $this->factory->createText($node->data);
- return;
- } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
- // undo libxml's special treatment of <script> and <style> tags
- $last = end($tokens);
- $data = $node->data;
- // (note $node->tagname is already normalized)
- if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
- $new_data = trim($data);
- if (substr($new_data, 0, 4) === '<!--') {
- $data = substr($new_data, 4);
- if (substr($data, -3) === '-->') {
- $data = substr($data, 0, -3);
- } else {
- // Highly suspicious! Not sure what to do...
- }
- }
- }
- $tokens[] = $this->factory->createText($this->parseData($data));
- return;
- } elseif ($node->nodeType === XML_COMMENT_NODE) {
- // this is code is only invoked for comments in script/style in versions
- // of libxml pre-2.6.28 (regular comments, of course, are still
- // handled regularly)
- $tokens[] = $this->factory->createComment($node->data);
- return;
- } elseif (
- // not-well tested: there may be other nodes we have to grab
- $node->nodeType !== XML_ELEMENT_NODE
- ) {
- return;
- }
-
- $attr = $node->hasAttributes() ?
- $this->transformAttrToAssoc($node->attributes) :
- array();
-
- // We still have to make sure that the element actually IS empty
- if (!$node->childNodes->length) {
- if ($collect) {
- $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
- }
- } else {
- if ($collect) { // don't wrap on first iteration
- $tokens[] = $this->factory->createStart(
- $tag_name = $node->tagName, // somehow, it get's dropped
- $attr
- );
- }
- foreach ($node->childNodes as $node) {
- // remember, it's an accumulator. Otherwise, we'd have
- // to use array_merge
- $this->tokenizeDOM($node, $tokens, true);
- }
- if ($collect) {
- $tokens[] = $this->factory->createEnd($tag_name);
- }
- }
-
- }
-
- /**
- * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
- *
- * @param $attribute_list DOMNamedNodeMap of DOMAttr objects.
- * @returns Associative array of attributes.
- */
- protected function transformAttrToAssoc($node_map) {
- // NamedNodeMap is documented very well, so we're using undocumented
- // features, namely, the fact that it implements Iterator and
- // has a ->length attribute
- if ($node_map->length === 0) return array();
- $array = array();
- foreach ($node_map as $attr) {
- $array[$attr->name] = $attr->value;
- }
- return $array;
- }
-
- /**
- * An error handler that mutes all errors
- */
- public function muteErrorHandler($errno, $errstr) {}
-
- /**
- * Callback function for undoing escaping of stray angled brackets
- * in comments
- */
- public function callbackUndoCommentSubst($matches) {
- return '<!--' . strtr($matches[1], array('&amp;'=>'&','&lt;'=>'<')) . $matches[2];
- }
-
- /**
- * Callback function that entity-izes ampersands in comments so that
- * callbackUndoCommentSubst doesn't clobber them
- */
- public function callbackArmorCommentEntities($matches) {
- return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
- }
-
- /**
- * Wraps an HTML fragment in the necessary HTML
- */
- protected function wrapHTML($html, $config, $context) {
- $def = $config->getDefinition('HTML');
- $ret = '';
-
- if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
- $ret .= '<!DOCTYPE html ';
- if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
- if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
- $ret .= '>';
- }
-
- $ret .= '<html><head>';
- $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
- // No protection if $html contains a stray </div>!
- $ret .= '</head><body><div>'.$html.'</div></body></html>';
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php b/extlib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
deleted file mode 100644
index 439409d05..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-
-/**
- * Our in-house implementation of a parser.
- *
- * A pure PHP parser, DirectLex has absolutely no dependencies, making
- * it a reasonably good default for PHP4. Written with efficiency in mind,
- * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
- * pales in comparison to HTMLPurifier_Lexer_DOMLex.
- *
- * @todo Reread XML spec and document differences.
- */
-class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
-{
-
- public $tracksLineNumbers = true;
-
- /**
- * Whitespace characters for str(c)spn.
- */
- protected $_whitespace = "\x20\x09\x0D\x0A";
-
- /**
- * Callback function for script CDATA fudge
- * @param $matches, in form of array(opening tag, contents, closing tag)
- */
- protected function scriptCallback($matches) {
- return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
- }
-
- public function tokenizeHTML($html, $config, $context) {
-
- // special normalization for script tags without any armor
- // our "armor" heurstic is a < sign any number of whitespaces after
- // the first script tag
- if ($config->get('HTML.Trusted')) {
- $html = preg_replace_callback('#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
- array($this, 'scriptCallback'), $html);
- }
-
- $html = $this->normalize($html, $config, $context);
-
- $cursor = 0; // our location in the text
- $inside_tag = false; // whether or not we're parsing the inside of a tag
- $array = array(); // result array
-
- // This is also treated to mean maintain *column* numbers too
- $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
-
- if ($maintain_line_numbers === null) {
- // automatically determine line numbering by checking
- // if error collection is on
- $maintain_line_numbers = $config->get('Core.CollectErrors');
- }
-
- if ($maintain_line_numbers) {
- $current_line = 1;
- $current_col = 0;
- $length = strlen($html);
- } else {
- $current_line = false;
- $current_col = false;
- $length = false;
- }
- $context->register('CurrentLine', $current_line);
- $context->register('CurrentCol', $current_col);
- $nl = "\n";
- // how often to manually recalculate. This will ALWAYS be right,
- // but it's pretty wasteful. Set to 0 to turn off
- $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
-
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
-
- // for testing synchronization
- $loops = 0;
-
- while(++$loops) {
-
- // $cursor is either at the start of a token, or inside of
- // a tag (i.e. there was a < immediately before it), as indicated
- // by $inside_tag
-
- if ($maintain_line_numbers) {
-
- // $rcursor, however, is always at the start of a token.
- $rcursor = $cursor - (int) $inside_tag;
-
- // Column number is cheap, so we calculate it every round.
- // We're interested at the *end* of the newline string, so
- // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
- // from our "rcursor" position.
- $nl_pos = strrpos($html, $nl, $rcursor - $length);
- $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
-
- // recalculate lines
- if (
- $synchronize_interval && // synchronization is on
- $cursor > 0 && // cursor is further than zero
- $loops % $synchronize_interval === 0 // time to synchronize!
- ) {
- $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
- }
-
- }
-
- $position_next_lt = strpos($html, '<', $cursor);
- $position_next_gt = strpos($html, '>', $cursor);
-
- // triggers on "<b>asdf</b>" but not "asdf <b></b>"
- // special case to set up context
- if ($position_next_lt === $cursor) {
- $inside_tag = true;
- $cursor++;
- }
-
- if (!$inside_tag && $position_next_lt !== false) {
- // We are not inside tag and there still is another tag to parse
- $token = new
- HTMLPurifier_Token_Text(
- $this->parseData(
- substr(
- $html, $cursor, $position_next_lt - $cursor
- )
- )
- );
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
- }
- $array[] = $token;
- $cursor = $position_next_lt + 1;
- $inside_tag = true;
- continue;
- } elseif (!$inside_tag) {
- // We are not inside tag but there are no more tags
- // If we're already at the end, break
- if ($cursor === strlen($html)) break;
- // Create Text of rest of string
- $token = new
- HTMLPurifier_Token_Text(
- $this->parseData(
- substr(
- $html, $cursor
- )
- )
- );
- if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
- $array[] = $token;
- break;
- } elseif ($inside_tag && $position_next_gt !== false) {
- // We are in tag and it is well formed
- // Grab the internals of the tag
- $strlen_segment = $position_next_gt - $cursor;
-
- if ($strlen_segment < 1) {
- // there's nothing to process!
- $token = new HTMLPurifier_Token_Text('<');
- $cursor++;
- continue;
- }
-
- $segment = substr($html, $cursor, $strlen_segment);
-
- if ($segment === false) {
- // somehow, we attempted to access beyond the end of
- // the string, defense-in-depth, reported by Nate Abele
- break;
- }
-
- // Check if it's a comment
- if (
- substr($segment, 0, 3) === '!--'
- ) {
- // re-determine segment length, looking for -->
- $position_comment_end = strpos($html, '-->', $cursor);
- if ($position_comment_end === false) {
- // uh oh, we have a comment that extends to
- // infinity. Can't be helped: set comment
- // end position to end of string
- if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
- $position_comment_end = strlen($html);
- $end = true;
- } else {
- $end = false;
- }
- $strlen_segment = $position_comment_end - $cursor;
- $segment = substr($html, $cursor, $strlen_segment);
- $token = new
- HTMLPurifier_Token_Comment(
- substr(
- $segment, 3, $strlen_segment - 3
- )
- );
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
- }
- $array[] = $token;
- $cursor = $end ? $position_comment_end : $position_comment_end + 3;
- $inside_tag = false;
- continue;
- }
-
- // Check if it's an end tag
- $is_end_tag = (strpos($segment,'/') === 0);
- if ($is_end_tag) {
- $type = substr($segment, 1);
- $token = new HTMLPurifier_Token_End($type);
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $inside_tag = false;
- $cursor = $position_next_gt + 1;
- continue;
- }
-
- // Check leading character is alnum, if not, we may
- // have accidently grabbed an emoticon. Translate into
- // text and go our merry way
- if (!ctype_alpha($segment[0])) {
- // XML: $segment[0] !== '_' && $segment[0] !== ':'
- if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
- $token = new HTMLPurifier_Token_Text('<');
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $inside_tag = false;
- continue;
- }
-
- // Check if it is explicitly self closing, if so, remove
- // trailing slash. Remember, we could have a tag like <br>, so
- // any later token processing scripts must convert improperly
- // classified EmptyTags from StartTags.
- $is_self_closing = (strrpos($segment,'/') === $strlen_segment-1);
- if ($is_self_closing) {
- $strlen_segment--;
- $segment = substr($segment, 0, $strlen_segment);
- }
-
- // Check if there are any attributes
- $position_first_space = strcspn($segment, $this->_whitespace);
-
- if ($position_first_space >= $strlen_segment) {
- if ($is_self_closing) {
- $token = new HTMLPurifier_Token_Empty($segment);
- } else {
- $token = new HTMLPurifier_Token_Start($segment);
- }
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $inside_tag = false;
- $cursor = $position_next_gt + 1;
- continue;
- }
-
- // Grab out all the data
- $type = substr($segment, 0, $position_first_space);
- $attribute_string =
- trim(
- substr(
- $segment, $position_first_space
- )
- );
- if ($attribute_string) {
- $attr = $this->parseAttributeString(
- $attribute_string
- , $config, $context
- );
- } else {
- $attr = array();
- }
-
- if ($is_self_closing) {
- $token = new HTMLPurifier_Token_Empty($type, $attr);
- } else {
- $token = new HTMLPurifier_Token_Start($type, $attr);
- }
- if ($maintain_line_numbers) {
- $token->rawPosition($current_line, $current_col);
- $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
- }
- $array[] = $token;
- $cursor = $position_next_gt + 1;
- $inside_tag = false;
- continue;
- } else {
- // inside tag, but there's no ending > sign
- if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
- $token = new
- HTMLPurifier_Token_Text(
- '<' .
- $this->parseData(
- substr($html, $cursor)
- )
- );
- if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
- // no cursor scroll? Hmm...
- $array[] = $token;
- break;
- }
- break;
- }
-
- $context->destroy('CurrentLine');
- $context->destroy('CurrentCol');
- return $array;
- }
-
- /**
- * PHP 5.0.x compatible substr_count that implements offset and length
- */
- protected function substrCount($haystack, $needle, $offset, $length) {
- static $oldVersion;
- if ($oldVersion === null) {
- $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
- }
- if ($oldVersion) {
- $haystack = substr($haystack, $offset, $length);
- return substr_count($haystack, $needle);
- } else {
- return substr_count($haystack, $needle, $offset, $length);
- }
- }
-
- /**
- * Takes the inside of an HTML tag and makes an assoc array of attributes.
- *
- * @param $string Inside of tag excluding name.
- * @returns Assoc array of attributes.
- */
- public function parseAttributeString($string, $config, $context) {
- $string = (string) $string; // quick typecast
-
- if ($string == '') return array(); // no attributes
-
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
-
- // let's see if we can abort as quickly as possible
- // one equal sign, no spaces => one attribute
- $num_equal = substr_count($string, '=');
- $has_space = strpos($string, ' ');
- if ($num_equal === 0 && !$has_space) {
- // bool attribute
- return array($string => $string);
- } elseif ($num_equal === 1 && !$has_space) {
- // only one attribute
- list($key, $quoted_value) = explode('=', $string);
- $quoted_value = trim($quoted_value);
- if (!$key) {
- if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
- return array();
- }
- if (!$quoted_value) return array($key => '');
- $first_char = @$quoted_value[0];
- $last_char = @$quoted_value[strlen($quoted_value)-1];
-
- $same_quote = ($first_char == $last_char);
- $open_quote = ($first_char == '"' || $first_char == "'");
-
- if ( $same_quote && $open_quote) {
- // well behaved
- $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
- } else {
- // not well behaved
- if ($open_quote) {
- if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
- $value = substr($quoted_value, 1);
- } else {
- $value = $quoted_value;
- }
- }
- if ($value === false) $value = '';
- return array($key => $value);
- }
-
- // setup loop environment
- $array = array(); // return assoc array of attributes
- $cursor = 0; // current position in string (moves forward)
- $size = strlen($string); // size of the string (stays the same)
-
- // if we have unquoted attributes, the parser expects a terminating
- // space, so let's guarantee that there's always a terminating space.
- $string .= ' ';
-
- while(true) {
-
- if ($cursor >= $size) {
- break;
- }
-
- $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
- // grab the key
-
- $key_begin = $cursor; //we're currently at the start of the key
-
- // scroll past all characters that are the key (not whitespace or =)
- $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
-
- $key_end = $cursor; // now at the end of the key
-
- $key = substr($string, $key_begin, $key_end - $key_begin);
-
- if (!$key) {
- if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
- $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
- continue; // empty key
- }
-
- // scroll past all whitespace
- $cursor += strspn($string, $this->_whitespace, $cursor);
-
- if ($cursor >= $size) {
- $array[$key] = $key;
- break;
- }
-
- // if the next character is an equal sign, we've got a regular
- // pair, otherwise, it's a bool attribute
- $first_char = @$string[$cursor];
-
- if ($first_char == '=') {
- // key="value"
-
- $cursor++;
- $cursor += strspn($string, $this->_whitespace, $cursor);
-
- if ($cursor === false) {
- $array[$key] = '';
- break;
- }
-
- // we might be in front of a quote right now
-
- $char = @$string[$cursor];
-
- if ($char == '"' || $char == "'") {
- // it's quoted, end bound is $char
- $cursor++;
- $value_begin = $cursor;
- $cursor = strpos($string, $char, $cursor);
- $value_end = $cursor;
- } else {
- // it's not quoted, end bound is whitespace
- $value_begin = $cursor;
- $cursor += strcspn($string, $this->_whitespace, $cursor);
- $value_end = $cursor;
- }
-
- // we reached a premature end
- if ($cursor === false) {
- $cursor = $size;
- $value_end = $cursor;
- }
-
- $value = substr($string, $value_begin, $value_end - $value_begin);
- if ($value === false) $value = '';
- $array[$key] = $this->parseData($value);
- $cursor++;
-
- } else {
- // boolattr
- if ($key !== '') {
- $array[$key] = $key;
- } else {
- // purely theoretical
- if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
- }
-
- }
- }
- return $array;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php b/extlib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
deleted file mode 100644
index 57cffa82a..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Proof-of-concept lexer that uses the PEAR package XML_HTMLSax3 to parse HTML.
- *
- * PEAR, not suprisingly, also has a SAX parser for HTML. I don't know
- * very much about implementation, but it's fairly well written. However, that
- * abstraction comes at a price: performance. You need to have it installed,
- * and if the API changes, it might break our adapter. Not sure whether or not
- * it's UTF-8 aware, but it has some entity parsing trouble (in all areas,
- * text and attributes).
- *
- * Quite personally, I don't recommend using the PEAR class, and the defaults
- * don't use it. The unit tests do perform the tests on the SAX parser too, but
- * whatever it does for poorly formed HTML is up to it.
- *
- * @todo Generalize so that XML_HTMLSax is also supported.
- *
- * @warning Entity-resolution inside attributes is broken.
- */
-
-class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
-{
-
- /**
- * Internal accumulator array for SAX parsers.
- */
- protected $tokens = array();
-
- public function tokenizeHTML($string, $config, $context) {
-
- $this->tokens = array();
-
- $string = $this->normalize($string, $config, $context);
-
- $parser = new XML_HTMLSax3();
- $parser->set_object($this);
- $parser->set_element_handler('openHandler','closeHandler');
- $parser->set_data_handler('dataHandler');
- $parser->set_escape_handler('escapeHandler');
-
- // doesn't seem to work correctly for attributes
- $parser->set_option('XML_OPTION_ENTITIES_PARSED', 1);
-
- $parser->parse($string);
-
- return $this->tokens;
-
- }
-
- /**
- * Open tag event handler, interface is defined by PEAR package.
- */
- public function openHandler(&$parser, $name, $attrs, $closed) {
- // entities are not resolved in attrs
- foreach ($attrs as $key => $attr) {
- $attrs[$key] = $this->parseData($attr);
- }
- if ($closed) {
- $this->tokens[] = new HTMLPurifier_Token_Empty($name, $attrs);
- } else {
- $this->tokens[] = new HTMLPurifier_Token_Start($name, $attrs);
- }
- return true;
- }
-
- /**
- * Close tag event handler, interface is defined by PEAR package.
- */
- public function closeHandler(&$parser, $name) {
- // HTMLSax3 seems to always send empty tags an extra close tag
- // check and ignore if you see it:
- // [TESTME] to make sure it doesn't overreach
- if ($this->tokens[count($this->tokens)-1] instanceof HTMLPurifier_Token_Empty) {
- return true;
- }
- $this->tokens[] = new HTMLPurifier_Token_End($name);
- return true;
- }
-
- /**
- * Data event handler, interface is defined by PEAR package.
- */
- public function dataHandler(&$parser, $data) {
- $this->tokens[] = new HTMLPurifier_Token_Text($data);
- return true;
- }
-
- /**
- * Escaped text handler, interface is defined by PEAR package.
- */
- public function escapeHandler(&$parser, $data) {
- if (strpos($data, '--') === 0) {
- $this->tokens[] = new HTMLPurifier_Token_Comment($data);
- }
- // CDATA is handled elsewhere, but if it was handled here:
- //if (strpos($data, '[CDATA[') === 0) {
- // $this->tokens[] = new HTMLPurifier_Token_Text(
- // substr($data, 7, strlen($data) - 9) );
- //}
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php b/extlib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
deleted file mode 100644
index fa1bf973e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
+++ /dev/null
@@ -1,3906 +0,0 @@
-<?php
-
-/**
- * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library.
- * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts.
- *
- * @note
- * Recent changes to PHP's DOM extension have resulted in some fatal
- * error conditions with the original version of PH5P. Pending changes,
- * this lexer will punt to DirectLex if DOM throughs an exception.
- */
-
-class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex {
-
- public function tokenizeHTML($html, $config, $context) {
- $new_html = $this->normalize($html, $config, $context);
- $new_html = $this->wrapHTML($new_html, $config, $context);
- try {
- $parser = new HTML5($new_html);
- $doc = $parser->save();
- } catch (DOMException $e) {
- // Uh oh, it failed. Punt to DirectLex.
- $lexer = new HTMLPurifier_Lexer_DirectLex();
- $context->register('PH5PError', $e); // save the error, so we can detect it
- return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
- }
- $tokens = array();
- $this->tokenizeDOM(
- $doc->getElementsByTagName('html')->item(0)-> // <html>
- getElementsByTagName('body')->item(0)-> // <body>
- getElementsByTagName('div')->item(0) // <div>
- , $tokens);
- return $tokens;
- }
-
-}
-
-/*
-
-Copyright 2007 Jeroen van der Meer <http://jero.net/>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-class HTML5 {
- private $data;
- private $char;
- private $EOF;
- private $state;
- private $tree;
- private $token;
- private $content_model;
- private $escape = false;
- private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',
- 'Acirc;','Acirc','Agrave;','Agrave','Alpha;','Aring;','Aring','Atilde;',
- 'Atilde','Auml;','Auml','Beta;','COPY;','COPY','Ccedil;','Ccedil','Chi;',
- 'Dagger;','Delta;','ETH;','ETH','Eacute;','Eacute','Ecirc;','Ecirc','Egrave;',
- 'Egrave','Epsilon;','Eta;','Euml;','Euml','GT;','GT','Gamma;','Iacute;',
- 'Iacute','Icirc;','Icirc','Igrave;','Igrave','Iota;','Iuml;','Iuml','Kappa;',
- 'LT;','LT','Lambda;','Mu;','Ntilde;','Ntilde','Nu;','OElig;','Oacute;',
- 'Oacute','Ocirc;','Ocirc','Ograve;','Ograve','Omega;','Omicron;','Oslash;',
- 'Oslash','Otilde;','Otilde','Ouml;','Ouml','Phi;','Pi;','Prime;','Psi;',
- 'QUOT;','QUOT','REG;','REG','Rho;','Scaron;','Sigma;','THORN;','THORN',
- 'TRADE;','Tau;','Theta;','Uacute;','Uacute','Ucirc;','Ucirc','Ugrave;',
- 'Ugrave','Upsilon;','Uuml;','Uuml','Xi;','Yacute;','Yacute','Yuml;','Zeta;',
- 'aacute;','aacute','acirc;','acirc','acute;','acute','aelig;','aelig',
- 'agrave;','agrave','alefsym;','alpha;','amp;','amp','and;','ang;','apos;',
- 'aring;','aring','asymp;','atilde;','atilde','auml;','auml','bdquo;','beta;',
- 'brvbar;','brvbar','bull;','cap;','ccedil;','ccedil','cedil;','cedil',
- 'cent;','cent','chi;','circ;','clubs;','cong;','copy;','copy','crarr;',
- 'cup;','curren;','curren','dArr;','dagger;','darr;','deg;','deg','delta;',
- 'diams;','divide;','divide','eacute;','eacute','ecirc;','ecirc','egrave;',
- 'egrave','empty;','emsp;','ensp;','epsilon;','equiv;','eta;','eth;','eth',
- 'euml;','euml','euro;','exist;','fnof;','forall;','frac12;','frac12',
- 'frac14;','frac14','frac34;','frac34','frasl;','gamma;','ge;','gt;','gt',
- 'hArr;','harr;','hearts;','hellip;','iacute;','iacute','icirc;','icirc',
- 'iexcl;','iexcl','igrave;','igrave','image;','infin;','int;','iota;',
- 'iquest;','iquest','isin;','iuml;','iuml','kappa;','lArr;','lambda;','lang;',
- 'laquo;','laquo','larr;','lceil;','ldquo;','le;','lfloor;','lowast;','loz;',
- 'lrm;','lsaquo;','lsquo;','lt;','lt','macr;','macr','mdash;','micro;','micro',
- 'middot;','middot','minus;','mu;','nabla;','nbsp;','nbsp','ndash;','ne;',
- 'ni;','not;','not','notin;','nsub;','ntilde;','ntilde','nu;','oacute;',
- 'oacute','ocirc;','ocirc','oelig;','ograve;','ograve','oline;','omega;',
- 'omicron;','oplus;','or;','ordf;','ordf','ordm;','ordm','oslash;','oslash',
- 'otilde;','otilde','otimes;','ouml;','ouml','para;','para','part;','permil;',
- 'perp;','phi;','pi;','piv;','plusmn;','plusmn','pound;','pound','prime;',
- 'prod;','prop;','psi;','quot;','quot','rArr;','radic;','rang;','raquo;',
- 'raquo','rarr;','rceil;','rdquo;','real;','reg;','reg','rfloor;','rho;',
- 'rlm;','rsaquo;','rsquo;','sbquo;','scaron;','sdot;','sect;','sect','shy;',
- 'shy','sigma;','sigmaf;','sim;','spades;','sub;','sube;','sum;','sup1;',
- 'sup1','sup2;','sup2','sup3;','sup3','sup;','supe;','szlig;','szlig','tau;',
- 'there4;','theta;','thetasym;','thinsp;','thorn;','thorn','tilde;','times;',
- 'times','trade;','uArr;','uacute;','uacute','uarr;','ucirc;','ucirc',
- 'ugrave;','ugrave','uml;','uml','upsih;','upsilon;','uuml;','uuml','weierp;',
- 'xi;','yacute;','yacute','yen;','yen','yuml;','yuml','zeta;','zwj;','zwnj;');
-
- const PCDATA = 0;
- const RCDATA = 1;
- const CDATA = 2;
- const PLAINTEXT = 3;
-
- const DOCTYPE = 0;
- const STARTTAG = 1;
- const ENDTAG = 2;
- const COMMENT = 3;
- const CHARACTR = 4;
- const EOF = 5;
-
- public function __construct($data) {
- $data = str_replace("\r\n", "\n", $data);
- $data = str_replace("\r", null, $data);
-
- $this->data = $data;
- $this->char = -1;
- $this->EOF = strlen($data);
- $this->tree = new HTML5TreeConstructer;
- $this->content_model = self::PCDATA;
-
- $this->state = 'data';
-
- while($this->state !== null) {
- $this->{$this->state.'State'}();
- }
- }
-
- public function save() {
- return $this->tree->save();
- }
-
- private function char() {
- return ($this->char < $this->EOF)
- ? $this->data[$this->char]
- : false;
- }
-
- private function character($s, $l = 0) {
- if($s + $l < $this->EOF) {
- if($l === 0) {
- return $this->data[$s];
- } else {
- return substr($this->data, $s, $l);
- }
- }
- }
-
- private function characters($char_class, $start) {
- return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start));
- }
-
- private function dataState() {
- // Consume the next input character
- $this->char++;
- $char = $this->char();
-
- if($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
- /* U+0026 AMPERSAND (&)
- When the content model flag is set to one of the PCDATA or RCDATA
- states: switch to the entity data state. Otherwise: treat it as per
- the "anything else" entry below. */
- $this->state = 'entityData';
-
- } elseif($char === '-') {
- /* If the content model flag is set to either the RCDATA state or
- the CDATA state, and the escape flag is false, and there are at
- least three characters before this one in the input stream, and the
- last four characters in the input stream, including this one, are
- U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
- and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
- if(($this->content_model === self::RCDATA || $this->content_model ===
- self::CDATA) && $this->escape === false &&
- $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--') {
- $this->escape = true;
- }
-
- /* In any case, emit the input character as a character token. Stay
- in the data state. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => $char
- ));
-
- /* U+003C LESS-THAN SIGN (<) */
- } elseif($char === '<' && ($this->content_model === self::PCDATA ||
- (($this->content_model === self::RCDATA ||
- $this->content_model === self::CDATA) && $this->escape === false))) {
- /* When the content model flag is set to the PCDATA state: switch
- to the tag open state.
-
- When the content model flag is set to either the RCDATA state or
- the CDATA state and the escape flag is false: switch to the tag
- open state.
-
- Otherwise: treat it as per the "anything else" entry below. */
- $this->state = 'tagOpen';
-
- /* U+003E GREATER-THAN SIGN (>) */
- } elseif($char === '>') {
- /* If the content model flag is set to either the RCDATA state or
- the CDATA state, and the escape flag is true, and the last three
- characters in the input stream including this one are U+002D
- HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
- set the escape flag to false. */
- if(($this->content_model === self::RCDATA ||
- $this->content_model === self::CDATA) && $this->escape === true &&
- $this->character($this->char, 3) === '-->') {
- $this->escape = false;
- }
-
- /* In any case, emit the input character as a character token.
- Stay in the data state. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => $char
- ));
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Emit an end-of-file token. */
- $this->EOF();
-
- } elseif($this->content_model === self::PLAINTEXT) {
- /* When the content model flag is set to the PLAINTEXT state
- THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
- the text and emit it as a character token. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => substr($this->data, $this->char)
- ));
-
- $this->EOF();
-
- } else {
- /* Anything else
- THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
- otherwise would also be treated as a character token and emit it
- as a single character token. Stay in the data state. */
- $len = strcspn($this->data, '<&', $this->char);
- $char = substr($this->data, $this->char, $len);
- $this->char += $len - 1;
-
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => $char
- ));
-
- $this->state = 'data';
- }
- }
-
- private function entityDataState() {
- // Attempt to consume an entity.
- $entity = $this->entity();
-
- // If nothing is returned, emit a U+0026 AMPERSAND character token.
- // Otherwise, emit the character token that was returned.
- $char = (!$entity) ? '&' : $entity;
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => $char
- ));
-
- // Finally, switch to the data state.
- $this->state = 'data';
- }
-
- private function tagOpenState() {
- switch($this->content_model) {
- case self::RCDATA:
- case self::CDATA:
- /* If the next input character is a U+002F SOLIDUS (/) character,
- consume it and switch to the close tag open state. If the next
- input character is not a U+002F SOLIDUS (/) character, emit a
- U+003C LESS-THAN SIGN character token and switch to the data
- state to process the next input character. */
- if($this->character($this->char + 1) === '/') {
- $this->char++;
- $this->state = 'closeTagOpen';
-
- } else {
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => '<'
- ));
-
- $this->state = 'data';
- }
- break;
-
- case self::PCDATA:
- // If the content model flag is set to the PCDATA state
- // Consume the next input character:
- $this->char++;
- $char = $this->char();
-
- if($char === '!') {
- /* U+0021 EXCLAMATION MARK (!)
- Switch to the markup declaration open state. */
- $this->state = 'markupDeclarationOpen';
-
- } elseif($char === '/') {
- /* U+002F SOLIDUS (/)
- Switch to the close tag open state. */
- $this->state = 'closeTagOpen';
-
- } elseif(preg_match('/^[A-Za-z]$/', $char)) {
- /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
- Create a new start tag token, set its tag name to the lowercase
- version of the input character (add 0x0020 to the character's code
- point), then switch to the tag name state. (Don't emit the token
- yet; further details will be filled in before it is emitted.) */
- $this->token = array(
- 'name' => strtolower($char),
- 'type' => self::STARTTAG,
- 'attr' => array()
- );
-
- $this->state = 'tagName';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Parse error. Emit a U+003C LESS-THAN SIGN character token and a
- U+003E GREATER-THAN SIGN character token. Switch to the data state. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => '<>'
- ));
-
- $this->state = 'data';
-
- } elseif($char === '?') {
- /* U+003F QUESTION MARK (?)
- Parse error. Switch to the bogus comment state. */
- $this->state = 'bogusComment';
-
- } else {
- /* Anything else
- Parse error. Emit a U+003C LESS-THAN SIGN character token and
- reconsume the current input character in the data state. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => '<'
- ));
-
- $this->char--;
- $this->state = 'data';
- }
- break;
- }
- }
-
- private function closeTagOpenState() {
- $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
- $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
-
- if(($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
- (!$the_same || ($the_same && (!preg_match('/[\t\n\x0b\x0c >\/]/',
- $this->character($this->char + 1 + strlen($next_node))) || $this->EOF === $this->char)))) {
- /* If the content model flag is set to the RCDATA or CDATA states then
- examine the next few characters. If they do not match the tag name of
- the last start tag token emitted (case insensitively), or if they do but
- they are not immediately followed by one of the following characters:
- * U+0009 CHARACTER TABULATION
- * U+000A LINE FEED (LF)
- * U+000B LINE TABULATION
- * U+000C FORM FEED (FF)
- * U+0020 SPACE
- * U+003E GREATER-THAN SIGN (>)
- * U+002F SOLIDUS (/)
- * EOF
- ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
- token, a U+002F SOLIDUS character token, and switch to the data state
- to process the next input character. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => '</'
- ));
-
- $this->state = 'data';
-
- } else {
- /* Otherwise, if the content model flag is set to the PCDATA state,
- or if the next few characters do match that tag name, consume the
- next input character: */
- $this->char++;
- $char = $this->char();
-
- if(preg_match('/^[A-Za-z]$/', $char)) {
- /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
- Create a new end tag token, set its tag name to the lowercase version
- of the input character (add 0x0020 to the character's code point), then
- switch to the tag name state. (Don't emit the token yet; further details
- will be filled in before it is emitted.) */
- $this->token = array(
- 'name' => strtolower($char),
- 'type' => self::ENDTAG
- );
-
- $this->state = 'tagName';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Parse error. Switch to the data state. */
- $this->state = 'data';
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
- SOLIDUS character token. Reconsume the EOF character in the data state. */
- $this->emitToken(array(
- 'type' => self::CHARACTR,
- 'data' => '</'
- ));
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Parse error. Switch to the bogus comment state. */
- $this->state = 'bogusComment';
- }
- }
- }
-
- private function tagNameState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } elseif($char === '/') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Switch to the before
- attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } else {
- /* Anything else
- Append the current input character to the current tag token's tag name.
- Stay in the tag name state. */
- $this->token['name'] .= strtolower($char);
- $this->state = 'tagName';
- }
- }
-
- private function beforeAttributeNameState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($char === '/') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Stay in the before
- attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Start a new attribute in the current tag token. Set that attribute's
- name to the current input character, and its value to the empty string.
- Switch to the attribute name state. */
- $this->token['attr'][] = array(
- 'name' => strtolower($char),
- 'value' => null
- );
-
- $this->state = 'attributeName';
- }
- }
-
- private function attributeNameState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the before attribute name state. */
- $this->state = 'afterAttributeName';
-
- } elseif($char === '=') {
- /* U+003D EQUALS SIGN (=)
- Switch to the before attribute value state. */
- $this->state = 'beforeAttributeValue';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Switch to the before
- attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's name.
- Stay in the attribute name state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['name'] .= strtolower($char);
-
- $this->state = 'attributeName';
- }
- }
-
- private function afterAttributeNameState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the after attribute name state. */
- $this->state = 'afterAttributeName';
-
- } elseif($char === '=') {
- /* U+003D EQUALS SIGN (=)
- Switch to the before attribute value state. */
- $this->state = 'beforeAttributeValue';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
- /* U+002F SOLIDUS (/)
- Parse error unless this is a permitted slash. Switch to the
- before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the EOF
- character in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Start a new attribute in the current tag token. Set that attribute's
- name to the current input character, and its value to the empty string.
- Switch to the attribute name state. */
- $this->token['attr'][] = array(
- 'name' => strtolower($char),
- 'value' => null
- );
-
- $this->state = 'attributeName';
- }
- }
-
- private function beforeAttributeValueState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Stay in the before attribute value state. */
- $this->state = 'beforeAttributeValue';
-
- } elseif($char === '"') {
- /* U+0022 QUOTATION MARK (")
- Switch to the attribute value (double-quoted) state. */
- $this->state = 'attributeValueDoubleQuoted';
-
- } elseif($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the attribute value (unquoted) state and reconsume
- this input character. */
- $this->char--;
- $this->state = 'attributeValueUnquoted';
-
- } elseif($char === '\'') {
- /* U+0027 APOSTROPHE (')
- Switch to the attribute value (single-quoted) state. */
- $this->state = 'attributeValueSingleQuoted';
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Switch to the attribute value (unquoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueUnquoted';
- }
- }
-
- private function attributeValueDoubleQuotedState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if($char === '"') {
- /* U+0022 QUOTATION MARK (")
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the entity in attribute value state. */
- $this->entityInAttributeValueState('double');
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the character
- in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Stay in the attribute value (double-quoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueDoubleQuoted';
- }
- }
-
- private function attributeValueSingleQuotedState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if($char === '\'') {
- /* U+0022 QUOTATION MARK (')
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the entity in attribute value state. */
- $this->entityInAttributeValueState('single');
-
- } elseif($this->char === $this->EOF) {
- /* EOF
- Parse error. Emit the current tag token. Reconsume the character
- in the data state. */
- $this->emitToken($this->token);
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Stay in the attribute value (single-quoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueSingleQuoted';
- }
- }
-
- private function attributeValueUnquotedState() {
- // Consume the next input character:
- $this->char++;
- $char = $this->character($this->char);
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- /* U+0009 CHARACTER TABULATION
- U+000A LINE FEED (LF)
- U+000B LINE TABULATION
- U+000C FORM FEED (FF)
- U+0020 SPACE
- Switch to the before attribute name state. */
- $this->state = 'beforeAttributeName';
-
- } elseif($char === '&') {
- /* U+0026 AMPERSAND (&)
- Switch to the entity in attribute value state. */
- $this->entityInAttributeValueState();
-
- } elseif($char === '>') {
- /* U+003E GREATER-THAN SIGN (>)
- Emit the current tag token. Switch to the data state. */
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } else {
- /* Anything else
- Append the current input character to the current attribute's value.
- Stay in the attribute value (unquoted) state. */
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
-
- $this->state = 'attributeValueUnquoted';
- }
- }
-
- private function entityInAttributeValueState() {
- // Attempt to consume an entity.
- $entity = $this->entity();
-
- // If nothing is returned, append a U+0026 AMPERSAND character to the
- // current attribute's value. Otherwise, emit the character token that
- // was returned.
- $char = (!$entity)
- ? '&'
- : $entity;
-
- $last = count($this->token['attr']) - 1;
- $this->token['attr'][$last]['value'] .= $char;
- }
-
- private function bogusCommentState() {
- /* Consume every character up to the first U+003E GREATER-THAN SIGN
- character (>) or the end of the file (EOF), whichever comes first. Emit
- a comment token whose data is the concatenation of all the characters
- starting from and including the character that caused the state machine
- to switch into the bogus comment state, up to and including the last
- consumed character before the U+003E character, if any, or up to the
- end of the file otherwise. (If the comment was started by the end of
- the file (EOF), the token is empty.) */
- $data = $this->characters('^>', $this->char);
- $this->emitToken(array(
- 'data' => $data,
- 'type' => self::COMMENT
- ));
-
- $this->char += strlen($data);
-
- /* Switch to the data state. */
- $this->state = 'data';
-
- /* If the end of the file was reached, reconsume the EOF character. */
- if($this->char === $this->EOF) {
- $this->char = $this->EOF - 1;
- }
- }
-
- private function markupDeclarationOpenState() {
- /* If the next two characters are both U+002D HYPHEN-MINUS (-)
- characters, consume those two characters, create a comment token whose
- data is the empty string, and switch to the comment state. */
- if($this->character($this->char + 1, 2) === '--') {
- $this->char += 2;
- $this->state = 'comment';
- $this->token = array(
- 'data' => null,
- 'type' => self::COMMENT
- );
-
- /* Otherwise if the next seven chacacters are a case-insensitive match
- for the word "DOCTYPE", then consume those characters and switch to the
- DOCTYPE state. */
- } elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
- $this->char += 7;
- $this->state = 'doctype';
-
- /* Otherwise, is is a parse error. Switch to the bogus comment state.
- The next character that is consumed, if any, is the first character
- that will be in the comment. */
- } else {
- $this->char++;
- $this->state = 'bogusComment';
- }
- }
-
- private function commentState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- /* U+002D HYPHEN-MINUS (-) */
- if($char === '-') {
- /* Switch to the comment dash state */
- $this->state = 'commentDash';
-
- /* EOF */
- } elseif($this->char === $this->EOF) {
- /* Parse error. Emit the comment token. Reconsume the EOF character
- in the data state. */
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- /* Anything else */
- } else {
- /* Append the input character to the comment token's data. Stay in
- the comment state. */
- $this->token['data'] .= $char;
- }
- }
-
- private function commentDashState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- /* U+002D HYPHEN-MINUS (-) */
- if($char === '-') {
- /* Switch to the comment end state */
- $this->state = 'commentEnd';
-
- /* EOF */
- } elseif($this->char === $this->EOF) {
- /* Parse error. Emit the comment token. Reconsume the EOF character
- in the data state. */
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- /* Anything else */
- } else {
- /* Append a U+002D HYPHEN-MINUS (-) character and the input
- character to the comment token's data. Switch to the comment state. */
- $this->token['data'] .= '-'.$char;
- $this->state = 'comment';
- }
- }
-
- private function commentEndState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($char === '-') {
- $this->token['data'] .= '-';
-
- } elseif($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token['data'] .= '--'.$char;
- $this->state = 'comment';
- }
- }
-
- private function doctypeState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- $this->state = 'beforeDoctypeName';
-
- } else {
- $this->char--;
- $this->state = 'beforeDoctypeName';
- }
- }
-
- private function beforeDoctypeNameState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- // Stay in the before DOCTYPE name state.
-
- } elseif(preg_match('/^[a-z]$/', $char)) {
- $this->token = array(
- 'name' => strtoupper($char),
- 'type' => self::DOCTYPE,
- 'error' => true
- );
-
- $this->state = 'doctypeName';
-
- } elseif($char === '>') {
- $this->emitToken(array(
- 'name' => null,
- 'type' => self::DOCTYPE,
- 'error' => true
- ));
-
- $this->state = 'data';
-
- } elseif($this->char === $this->EOF) {
- $this->emitToken(array(
- 'name' => null,
- 'type' => self::DOCTYPE,
- 'error' => true
- ));
-
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token = array(
- 'name' => $char,
- 'type' => self::DOCTYPE,
- 'error' => true
- );
-
- $this->state = 'doctypeName';
- }
- }
-
- private function doctypeNameState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- $this->state = 'AfterDoctypeName';
-
- } elseif($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif(preg_match('/^[a-z]$/', $char)) {
- $this->token['name'] .= strtoupper($char);
-
- } elseif($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token['name'] .= $char;
- }
-
- $this->token['error'] = ($this->token['name'] === 'HTML')
- ? false
- : true;
- }
-
- private function afterDoctypeNameState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
- // Stay in the DOCTYPE name state.
-
- } elseif($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- $this->token['error'] = true;
- $this->state = 'bogusDoctype';
- }
- }
-
- private function bogusDoctypeState() {
- /* Consume the next input character: */
- $this->char++;
- $char = $this->char();
-
- if($char === '>') {
- $this->emitToken($this->token);
- $this->state = 'data';
-
- } elseif($this->char === $this->EOF) {
- $this->emitToken($this->token);
- $this->char--;
- $this->state = 'data';
-
- } else {
- // Stay in the bogus DOCTYPE state.
- }
- }
-
- private function entity() {
- $start = $this->char;
-
- // This section defines how to consume an entity. This definition is
- // used when parsing entities in text and in attributes.
-
- // The behaviour depends on the identity of the next character (the
- // one immediately after the U+0026 AMPERSAND character):
-
- switch($this->character($this->char + 1)) {
- // U+0023 NUMBER SIGN (#)
- case '#':
-
- // The behaviour further depends on the character after the
- // U+0023 NUMBER SIGN:
- switch($this->character($this->char + 1)) {
- // U+0078 LATIN SMALL LETTER X
- // U+0058 LATIN CAPITAL LETTER X
- case 'x':
- case 'X':
- // Follow the steps below, but using the range of
- // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
- // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
- // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
- // A, through to U+0046 LATIN CAPITAL LETTER F (in other
- // words, 0-9, A-F, a-f).
- $char = 1;
- $char_class = '0-9A-Fa-f';
- break;
-
- // Anything else
- default:
- // Follow the steps below, but using the range of
- // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
- // NINE (i.e. just 0-9).
- $char = 0;
- $char_class = '0-9';
- break;
- }
-
- // Consume as many characters as match the range of characters
- // given above.
- $this->char++;
- $e_name = $this->characters($char_class, $this->char + $char + 1);
- $entity = $this->character($start, $this->char);
- $cond = strlen($e_name) > 0;
-
- // The rest of the parsing happens bellow.
- break;
-
- // Anything else
- default:
- // Consume the maximum number of characters possible, with the
- // consumed characters case-sensitively matching one of the
- // identifiers in the first column of the entities table.
- $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
- $len = strlen($e_name);
-
- for($c = 1; $c <= $len; $c++) {
- $id = substr($e_name, 0, $c);
- $this->char++;
-
- if(in_array($id, $this->entities)) {
- if ($e_name[$c-1] !== ';') {
- if ($c < $len && $e_name[$c] == ';') {
- $this->char++; // consume extra semicolon
- }
- }
- $entity = $id;
- break;
- }
- }
-
- $cond = isset($entity);
- // The rest of the parsing happens bellow.
- break;
- }
-
- if(!$cond) {
- // If no match can be made, then this is a parse error. No
- // characters are consumed, and nothing is returned.
- $this->char = $start;
- return false;
- }
-
- // Return a character token for the character corresponding to the
- // entity name (as given by the second column of the entities table).
- return html_entity_decode('&'.$entity.';', ENT_QUOTES, 'UTF-8');
- }
-
- private function emitToken($token) {
- $emit = $this->tree->emitToken($token);
-
- if(is_int($emit)) {
- $this->content_model = $emit;
-
- } elseif($token['type'] === self::ENDTAG) {
- $this->content_model = self::PCDATA;
- }
- }
-
- private function EOF() {
- $this->state = null;
- $this->tree->emitToken(array(
- 'type' => self::EOF
- ));
- }
-}
-
-class HTML5TreeConstructer {
- public $stack = array();
-
- private $phase;
- private $mode;
- private $dom;
- private $foster_parent = null;
- private $a_formatting = array();
-
- private $head_pointer = null;
- private $form_pointer = null;
-
- private $scoping = array('button','caption','html','marquee','object','table','td','th');
- private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');
- private $special = array('address','area','base','basefont','bgsound',
- 'blockquote','body','br','center','col','colgroup','dd','dir','div','dl',
- 'dt','embed','fieldset','form','frame','frameset','h1','h2','h3','h4','h5',
- 'h6','head','hr','iframe','image','img','input','isindex','li','link',
- 'listing','menu','meta','noembed','noframes','noscript','ol','optgroup',
- 'option','p','param','plaintext','pre','script','select','spacer','style',
- 'tbody','textarea','tfoot','thead','title','tr','ul','wbr');
-
- // The different phases.
- const INIT_PHASE = 0;
- const ROOT_PHASE = 1;
- const MAIN_PHASE = 2;
- const END_PHASE = 3;
-
- // The different insertion modes for the main phase.
- const BEFOR_HEAD = 0;
- const IN_HEAD = 1;
- const AFTER_HEAD = 2;
- const IN_BODY = 3;
- const IN_TABLE = 4;
- const IN_CAPTION = 5;
- const IN_CGROUP = 6;
- const IN_TBODY = 7;
- const IN_ROW = 8;
- const IN_CELL = 9;
- const IN_SELECT = 10;
- const AFTER_BODY = 11;
- const IN_FRAME = 12;
- const AFTR_FRAME = 13;
-
- // The different types of elements.
- const SPECIAL = 0;
- const SCOPING = 1;
- const FORMATTING = 2;
- const PHRASING = 3;
-
- const MARKER = 0;
-
- public function __construct() {
- $this->phase = self::INIT_PHASE;
- $this->mode = self::BEFOR_HEAD;
- $this->dom = new DOMDocument;
-
- $this->dom->encoding = 'UTF-8';
- $this->dom->preserveWhiteSpace = true;
- $this->dom->substituteEntities = true;
- $this->dom->strictErrorChecking = false;
- }
-
- // Process tag tokens
- public function emitToken($token) {
- switch($this->phase) {
- case self::INIT_PHASE: return $this->initPhase($token); break;
- case self::ROOT_PHASE: return $this->rootElementPhase($token); break;
- case self::MAIN_PHASE: return $this->mainPhase($token); break;
- case self::END_PHASE : return $this->trailingEndPhase($token); break;
- }
- }
-
- private function initPhase($token) {
- /* Initially, the tree construction stage must handle each token
- emitted from the tokenisation stage as follows: */
-
- /* A DOCTYPE token that is marked as being in error
- A comment token
- A start tag token
- An end tag token
- A character token that is not one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE
- An end-of-file token */
- if((isset($token['error']) && $token['error']) ||
- $token['type'] === HTML5::COMMENT ||
- $token['type'] === HTML5::STARTTAG ||
- $token['type'] === HTML5::ENDTAG ||
- $token['type'] === HTML5::EOF ||
- ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
- !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))) {
- /* This specification does not define how to handle this case. In
- particular, user agents may ignore the entirety of this specification
- altogether for such documents, and instead invoke special parse modes
- with a greater emphasis on backwards compatibility. */
-
- $this->phase = self::ROOT_PHASE;
- return $this->rootElementPhase($token);
-
- /* A DOCTYPE token marked as being correct */
- } elseif(isset($token['error']) && !$token['error']) {
- /* Append a DocumentType node to the Document node, with the name
- attribute set to the name given in the DOCTYPE token (which will be
- "HTML"), and the other attributes specific to DocumentType objects
- set to null, empty lists, or the empty string as appropriate. */
- $doctype = new DOMDocumentType(null, null, 'HTML');
-
- /* Then, switch to the root element phase of the tree construction
- stage. */
- $this->phase = self::ROOT_PHASE;
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- } elseif(isset($token['data']) && preg_match('/^[\t\n\x0b\x0c ]+$/',
- $token['data'])) {
- /* Append that character to the Document node. */
- $text = $this->dom->createTextNode($token['data']);
- $this->dom->appendChild($text);
- }
- }
-
- private function rootElementPhase($token) {
- /* After the initial phase, as each token is emitted from the tokenisation
- stage, it must be processed as described in this section. */
-
- /* A DOCTYPE token */
- if($token['type'] === HTML5::DOCTYPE) {
- // Parse error. Ignore the token.
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the Document object with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- $this->dom->appendChild($comment);
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- } elseif($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append that character to the Document node. */
- $text = $this->dom->createTextNode($token['data']);
- $this->dom->appendChild($text);
-
- /* A character token that is not one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED
- (FF), or U+0020 SPACE
- A start tag token
- An end tag token
- An end-of-file token */
- } elseif(($token['type'] === HTML5::CHARACTR &&
- !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
- $token['type'] === HTML5::STARTTAG ||
- $token['type'] === HTML5::ENDTAG ||
- $token['type'] === HTML5::EOF) {
- /* Create an HTMLElement node with the tag name html, in the HTML
- namespace. Append it to the Document object. Switch to the main
- phase and reprocess the current token. */
- $html = $this->dom->createElement('html');
- $this->dom->appendChild($html);
- $this->stack[] = $html;
-
- $this->phase = self::MAIN_PHASE;
- return $this->mainPhase($token);
- }
- }
-
- private function mainPhase($token) {
- /* Tokens in the main phase must be handled as follows: */
-
- /* A DOCTYPE token */
- if($token['type'] === HTML5::DOCTYPE) {
- // Parse error. Ignore the token.
-
- /* A start tag token with the tag name "html" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
- /* If this start tag token was not the first start tag token, then
- it is a parse error. */
-
- /* For each attribute on the token, check to see if the attribute
- is already present on the top element of the stack of open elements.
- If it is not, add the attribute and its corresponding value to that
- element. */
- foreach($token['attr'] as $attr) {
- if(!$this->stack[0]->hasAttribute($attr['name'])) {
- $this->stack[0]->setAttribute($attr['name'], $attr['value']);
- }
- }
-
- /* An end-of-file token */
- } elseif($token['type'] === HTML5::EOF) {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* Anything else. */
- } else {
- /* Depends on the insertion mode: */
- switch($this->mode) {
- case self::BEFOR_HEAD: return $this->beforeHead($token); break;
- case self::IN_HEAD: return $this->inHead($token); break;
- case self::AFTER_HEAD: return $this->afterHead($token); break;
- case self::IN_BODY: return $this->inBody($token); break;
- case self::IN_TABLE: return $this->inTable($token); break;
- case self::IN_CAPTION: return $this->inCaption($token); break;
- case self::IN_CGROUP: return $this->inColumnGroup($token); break;
- case self::IN_TBODY: return $this->inTableBody($token); break;
- case self::IN_ROW: return $this->inRow($token); break;
- case self::IN_CELL: return $this->inCell($token); break;
- case self::IN_SELECT: return $this->inSelect($token); break;
- case self::AFTER_BODY: return $this->afterBody($token); break;
- case self::IN_FRAME: return $this->inFrameset($token); break;
- case self::AFTR_FRAME: return $this->afterFrameset($token); break;
- case self::END_PHASE: return $this->trailingEndPhase($token); break;
- }
- }
- }
-
- private function beforeHead($token) {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data attribute
- set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag token with the tag name "head" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
- /* Create an element for the token, append the new element to the
- current node and push it onto the stack of open elements. */
- $element = $this->insertElement($token);
-
- /* Set the head element pointer to this new element node. */
- $this->head_pointer = $element;
-
- /* Change the insertion mode to "in head". */
- $this->mode = self::IN_HEAD;
-
- /* A start tag token whose tag name is one of: "base", "link", "meta",
- "script", "style", "title". Or an end tag with the tag name "html".
- Or a character token that is not one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE. Or any other start tag token */
- } elseif($token['type'] === HTML5::STARTTAG ||
- ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
- ($token['type'] === HTML5::CHARACTR && !preg_match('/^[\t\n\x0b\x0c ]$/',
- $token['data']))) {
- /* Act as if a start tag token with the tag name "head" and no
- attributes had been seen, then reprocess the current token. */
- $this->beforeHead(array(
- 'name' => 'head',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- return $this->inHead($token);
-
- /* Any other end tag */
- } elseif($token['type'] === HTML5::ENDTAG) {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function inHead($token) {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE.
-
- THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
- or script element, append the character to the current node regardless
- of its content. */
- if(($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
- $token['type'] === HTML5::CHARACTR && in_array(end($this->stack)->nodeName,
- array('title', 'style', 'script')))) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data attribute
- set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- } elseif($token['type'] === HTML5::ENDTAG &&
- in_array($token['name'], array('title', 'style', 'script'))) {
- array_pop($this->stack);
- return HTML5::PCDATA;
-
- /* A start tag with the tag name "title" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
- /* Create an element for the token and append the new element to the
- node pointed to by the head element pointer, or, if that is null
- (innerHTML case), to the current node. */
- if($this->head_pointer !== null) {
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
-
- } else {
- $element = $this->insertElement($token);
- }
-
- /* Switch the tokeniser's content model flag to the RCDATA state. */
- return HTML5::RCDATA;
-
- /* A start tag with the tag name "style" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
- /* Create an element for the token and append the new element to the
- node pointed to by the head element pointer, or, if that is null
- (innerHTML case), to the current node. */
- if($this->head_pointer !== null) {
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
-
- } else {
- $this->insertElement($token);
- }
-
- /* Switch the tokeniser's content model flag to the CDATA state. */
- return HTML5::CDATA;
-
- /* A start tag with the tag name "script" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
- /* Create an element for the token. */
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
-
- /* Switch the tokeniser's content model flag to the CDATA state. */
- return HTML5::CDATA;
-
- /* A start tag with the tag name "base", "link", or "meta" */
- } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('base', 'link', 'meta'))) {
- /* Create an element for the token and append the new element to the
- node pointed to by the head element pointer, or, if that is null
- (innerHTML case), to the current node. */
- if($this->head_pointer !== null) {
- $element = $this->insertElement($token, false);
- $this->head_pointer->appendChild($element);
- array_pop($this->stack);
-
- } else {
- $this->insertElement($token);
- }
-
- /* An end tag with the tag name "head" */
- } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
- /* If the current node is a head element, pop the current node off
- the stack of open elements. */
- if($this->head_pointer->isSameNode(end($this->stack))) {
- array_pop($this->stack);
-
- /* Otherwise, this is a parse error. */
- } else {
- // k
- }
-
- /* Change the insertion mode to "after head". */
- $this->mode = self::AFTER_HEAD;
-
- /* A start tag with the tag name "head" or an end tag except "html". */
- } elseif(($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
- ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')) {
- // Parse error. Ignore the token.
-
- /* Anything else */
- } else {
- /* If the current node is a head element, act as if an end tag
- token with the tag name "head" had been seen. */
- if($this->head_pointer->isSameNode(end($this->stack))) {
- $this->inHead(array(
- 'name' => 'head',
- 'type' => HTML5::ENDTAG
- ));
-
- /* Otherwise, change the insertion mode to "after head". */
- } else {
- $this->mode = self::AFTER_HEAD;
- }
-
- /* Then, reprocess the current token. */
- return $this->afterHead($token);
- }
- }
-
- private function afterHead($token) {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data attribute
- set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag token with the tag name "body" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
- /* Insert a body element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in body". */
- $this->mode = self::IN_BODY;
-
- /* A start tag token with the tag name "frameset" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
- /* Insert a frameset element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in frameset". */
- $this->mode = self::IN_FRAME;
-
- /* A start tag token whose tag name is one of: "base", "link", "meta",
- "script", "style", "title" */
- } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('base', 'link', 'meta', 'script', 'style', 'title'))) {
- /* Parse error. Switch the insertion mode back to "in head" and
- reprocess the token. */
- $this->mode = self::IN_HEAD;
- return $this->inHead($token);
-
- /* Anything else */
- } else {
- /* Act as if a start tag token with the tag name "body" and no
- attributes had been seen, and then reprocess the current token. */
- $this->afterHead(array(
- 'name' => 'body',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- return $this->inBody($token);
- }
- }
-
- private function inBody($token) {
- /* Handle the token as follows: */
-
- switch($token['type']) {
- /* A character token */
- case HTML5::CHARACTR:
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Append the token's character to the current node. */
- $this->insertText($token['data']);
- break;
-
- /* A comment token */
- case HTML5::COMMENT:
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
- break;
-
- case HTML5::STARTTAG:
- switch($token['name']) {
- /* A start tag token whose tag name is one of: "script",
- "style" */
- case 'script': case 'style':
- /* Process the token as if the insertion mode had been "in
- head". */
- return $this->inHead($token);
- break;
-
- /* A start tag token whose tag name is one of: "base", "link",
- "meta", "title" */
- case 'base': case 'link': case 'meta': case 'title':
- /* Parse error. Process the token as if the insertion mode
- had been "in head". */
- return $this->inHead($token);
- break;
-
- /* A start tag token with the tag name "body" */
- case 'body':
- /* Parse error. If the second element on the stack of open
- elements is not a body element, or, if the stack of open
- elements has only one node on it, then ignore the token.
- (innerHTML case) */
- if(count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
- // Ignore
-
- /* Otherwise, for each attribute on the token, check to see
- if the attribute is already present on the body element (the
- second element) on the stack of open elements. If it is not,
- add the attribute and its corresponding value to that
- element. */
- } else {
- foreach($token['attr'] as $attr) {
- if(!$this->stack[1]->hasAttribute($attr['name'])) {
- $this->stack[1]->setAttribute($attr['name'], $attr['value']);
- }
- }
- }
- break;
-
- /* A start tag whose tag name is one of: "address",
- "blockquote", "center", "dir", "div", "dl", "fieldset",
- "listing", "menu", "ol", "p", "ul" */
- case 'address': case 'blockquote': case 'center': case 'dir':
- case 'div': case 'dl': case 'fieldset': case 'listing':
- case 'menu': case 'ol': case 'p': case 'ul':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been
- seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
- break;
-
- /* A start tag whose tag name is "form" */
- case 'form':
- /* If the form element pointer is not null, ignore the
- token with a parse error. */
- if($this->form_pointer !== null) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* If the stack of open elements has a p element in
- scope, then act as if an end tag with the tag name p
- had been seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token, and set the
- form element pointer to point to the element created. */
- $element = $this->insertElement($token);
- $this->form_pointer = $element;
- }
- break;
-
- /* A start tag whose tag name is "li", "dd" or "dt" */
- case 'li': case 'dd': case 'dt':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been
- seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- $stack_length = count($this->stack) - 1;
-
- for($n = $stack_length; 0 <= $n; $n--) {
- /* 1. Initialise node to be the current node (the
- bottommost node of the stack). */
- $stop = false;
- $node = $this->stack[$n];
- $cat = $this->getElementCategory($node->tagName);
-
- /* 2. If node is an li, dd or dt element, then pop all
- the nodes from the current node up to node, including
- node, then stop this algorithm. */
- if($token['name'] === $node->tagName || ($token['name'] !== 'li'
- && ($node->tagName === 'dd' || $node->tagName === 'dt'))) {
- for($x = $stack_length; $x >= $n ; $x--) {
- array_pop($this->stack);
- }
-
- break;
- }
-
- /* 3. If node is not in the formatting category, and is
- not in the phrasing category, and is not an address or
- div element, then stop this algorithm. */
- if($cat !== self::FORMATTING && $cat !== self::PHRASING &&
- $node->tagName !== 'address' && $node->tagName !== 'div') {
- break;
- }
- }
-
- /* Finally, insert an HTML element with the same tag
- name as the token's. */
- $this->insertElement($token);
- break;
-
- /* A start tag token whose tag name is "plaintext" */
- case 'plaintext':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been
- seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- return HTML5::PLAINTEXT;
- break;
-
- /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
- "h5", "h6" */
- case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* If the stack of open elements has in scope an element whose
- tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
- this is a parse error; pop elements from the stack until an
- element with one of those tag names has been popped from the
- stack. */
- while($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
- array_pop($this->stack);
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
- break;
-
- /* A start tag whose tag name is "a" */
- case 'a':
- /* If the list of active formatting elements contains
- an element whose tag name is "a" between the end of the
- list and the last marker on the list (or the start of
- the list if there is no marker on the list), then this
- is a parse error; act as if an end tag with the tag name
- "a" had been seen, then remove that element from the list
- of active formatting elements and the stack of open
- elements if the end tag didn't already remove it (it
- might not have if the element is not in table scope). */
- $leng = count($this->a_formatting);
-
- for($n = $leng - 1; $n >= 0; $n--) {
- if($this->a_formatting[$n] === self::MARKER) {
- break;
-
- } elseif($this->a_formatting[$n]->nodeName === 'a') {
- $this->emitToken(array(
- 'name' => 'a',
- 'type' => HTML5::ENDTAG
- ));
- break;
- }
- }
-
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $el = $this->insertElement($token);
-
- /* Add that element to the list of active formatting
- elements. */
- $this->a_formatting[] = $el;
- break;
-
- /* A start tag whose tag name is one of: "b", "big", "em", "font",
- "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
- case 'b': case 'big': case 'em': case 'font': case 'i':
- case 'nobr': case 's': case 'small': case 'strike':
- case 'strong': case 'tt': case 'u':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $el = $this->insertElement($token);
-
- /* Add that element to the list of active formatting
- elements. */
- $this->a_formatting[] = $el;
- break;
-
- /* A start tag token whose tag name is "button" */
- case 'button':
- /* If the stack of open elements has a button element in scope,
- then this is a parse error; act as if an end tag with the tag
- name "button" had been seen, then reprocess the token. (We don't
- do that. Unnecessary.) */
- if($this->elementInScope('button')) {
- $this->inBody(array(
- 'name' => 'button',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Insert a marker at the end of the list of active
- formatting elements. */
- $this->a_formatting[] = self::MARKER;
- break;
-
- /* A start tag token whose tag name is one of: "marquee", "object" */
- case 'marquee': case 'object':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Insert a marker at the end of the list of active
- formatting elements. */
- $this->a_formatting[] = self::MARKER;
- break;
-
- /* A start tag token whose tag name is "xmp" */
- case 'xmp':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Switch the content model flag to the CDATA state. */
- return HTML5::CDATA;
- break;
-
- /* A start tag whose tag name is "table" */
- case 'table':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in table". */
- $this->mode = self::IN_TABLE;
- break;
-
- /* A start tag whose tag name is one of: "area", "basefont",
- "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
- case 'area': case 'basefont': case 'bgsound': case 'br':
- case 'embed': case 'img': case 'param': case 'spacer':
- case 'wbr':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Immediately pop the current node off the stack of open elements. */
- array_pop($this->stack);
- break;
-
- /* A start tag whose tag name is "hr" */
- case 'hr':
- /* If the stack of open elements has a p element in scope,
- then act as if an end tag with the tag name p had been seen. */
- if($this->elementInScope('p')) {
- $this->emitToken(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Immediately pop the current node off the stack of open elements. */
- array_pop($this->stack);
- break;
-
- /* A start tag whose tag name is "image" */
- case 'image':
- /* Parse error. Change the token's tag name to "img" and
- reprocess it. (Don't ask.) */
- $token['name'] = 'img';
- return $this->inBody($token);
- break;
-
- /* A start tag whose tag name is "input" */
- case 'input':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an input element for the token. */
- $element = $this->insertElement($token, false);
-
- /* If the form element pointer is not null, then associate the
- input element with the form element pointed to by the form
- element pointer. */
- $this->form_pointer !== null
- ? $this->form_pointer->appendChild($element)
- : end($this->stack)->appendChild($element);
-
- /* Pop that input element off the stack of open elements. */
- array_pop($this->stack);
- break;
-
- /* A start tag whose tag name is "isindex" */
- case 'isindex':
- /* Parse error. */
- // w/e
-
- /* If the form element pointer is not null,
- then ignore the token. */
- if($this->form_pointer === null) {
- /* Act as if a start tag token with the tag name "form" had
- been seen. */
- $this->inBody(array(
- 'name' => 'body',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- /* Act as if a start tag token with the tag name "hr" had
- been seen. */
- $this->inBody(array(
- 'name' => 'hr',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- /* Act as if a start tag token with the tag name "p" had
- been seen. */
- $this->inBody(array(
- 'name' => 'p',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- /* Act as if a start tag token with the tag name "label"
- had been seen. */
- $this->inBody(array(
- 'name' => 'label',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- /* Act as if a stream of character tokens had been seen. */
- $this->insertText('This is a searchable index. '.
- 'Insert your search keywords here: ');
-
- /* Act as if a start tag token with the tag name "input"
- had been seen, with all the attributes from the "isindex"
- token, except with the "name" attribute set to the value
- "isindex" (ignoring any explicit "name" attribute). */
- $attr = $token['attr'];
- $attr[] = array('name' => 'name', 'value' => 'isindex');
-
- $this->inBody(array(
- 'name' => 'input',
- 'type' => HTML5::STARTTAG,
- 'attr' => $attr
- ));
-
- /* Act as if a stream of character tokens had been seen
- (see below for what they should say). */
- $this->insertText('This is a searchable index. '.
- 'Insert your search keywords here: ');
-
- /* Act as if an end tag token with the tag name "label"
- had been seen. */
- $this->inBody(array(
- 'name' => 'label',
- 'type' => HTML5::ENDTAG
- ));
-
- /* Act as if an end tag token with the tag name "p" had
- been seen. */
- $this->inBody(array(
- 'name' => 'p',
- 'type' => HTML5::ENDTAG
- ));
-
- /* Act as if a start tag token with the tag name "hr" had
- been seen. */
- $this->inBody(array(
- 'name' => 'hr',
- 'type' => HTML5::ENDTAG
- ));
-
- /* Act as if an end tag token with the tag name "form" had
- been seen. */
- $this->inBody(array(
- 'name' => 'form',
- 'type' => HTML5::ENDTAG
- ));
- }
- break;
-
- /* A start tag whose tag name is "textarea" */
- case 'textarea':
- $this->insertElement($token);
-
- /* Switch the tokeniser's content model flag to the
- RCDATA state. */
- return HTML5::RCDATA;
- break;
-
- /* A start tag whose tag name is one of: "iframe", "noembed",
- "noframes" */
- case 'iframe': case 'noembed': case 'noframes':
- $this->insertElement($token);
-
- /* Switch the tokeniser's content model flag to the CDATA state. */
- return HTML5::CDATA;
- break;
-
- /* A start tag whose tag name is "select" */
- case 'select':
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Change the insertion mode to "in select". */
- $this->mode = self::IN_SELECT;
- break;
-
- /* A start or end tag whose tag name is one of: "caption", "col",
- "colgroup", "frame", "frameset", "head", "option", "optgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr". */
- case 'caption': case 'col': case 'colgroup': case 'frame':
- case 'frameset': case 'head': case 'option': case 'optgroup':
- case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead':
- case 'tr':
- // Parse error. Ignore the token.
- break;
-
- /* A start or end tag whose tag name is one of: "event-source",
- "section", "nav", "article", "aside", "header", "footer",
- "datagrid", "command" */
- case 'event-source': case 'section': case 'nav': case 'article':
- case 'aside': case 'header': case 'footer': case 'datagrid':
- case 'command':
- // Work in progress!
- break;
-
- /* A start tag token not covered by the previous entries */
- default:
- /* Reconstruct the active formatting elements, if any. */
- $this->reconstructActiveFormattingElements();
-
- $this->insertElement($token, true, true);
- break;
- }
- break;
-
- case HTML5::ENDTAG:
- switch($token['name']) {
- /* An end tag with the tag name "body" */
- case 'body':
- /* If the second element in the stack of open elements is
- not a body element, this is a parse error. Ignore the token.
- (innerHTML case) */
- if(count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
- // Ignore.
-
- /* If the current node is not the body element, then this
- is a parse error. */
- } elseif(end($this->stack)->nodeName !== 'body') {
- // Parse error.
- }
-
- /* Change the insertion mode to "after body". */
- $this->mode = self::AFTER_BODY;
- break;
-
- /* An end tag with the tag name "html" */
- case 'html':
- /* Act as if an end tag with tag name "body" had been seen,
- then, if that token wasn't ignored, reprocess the current
- token. */
- $this->inBody(array(
- 'name' => 'body',
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->afterBody($token);
- break;
-
- /* An end tag whose tag name is one of: "address", "blockquote",
- "center", "dir", "div", "dl", "fieldset", "listing", "menu",
- "ol", "pre", "ul" */
- case 'address': case 'blockquote': case 'center': case 'dir':
- case 'div': case 'dl': case 'fieldset': case 'listing':
- case 'menu': case 'ol': case 'pre': case 'ul':
- /* If the stack of open elements has an element in scope
- with the same tag name as that of the token, then generate
- implied end tags. */
- if($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not an element with
- the same tag name as that of the token, then this
- is a parse error. */
- // w/e
-
- /* If the stack of open elements has an element in
- scope with the same tag name as that of the token,
- then pop elements from this stack until an element
- with that tag name has been popped from the stack. */
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- if($this->stack[$n]->nodeName === $token['name']) {
- $n = -1;
- }
-
- array_pop($this->stack);
- }
- }
- break;
-
- /* An end tag whose tag name is "form" */
- case 'form':
- /* If the stack of open elements has an element in scope
- with the same tag name as that of the token, then generate
- implied end tags. */
- if($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags();
-
- }
-
- if(end($this->stack)->nodeName !== $token['name']) {
- /* Now, if the current node is not an element with the
- same tag name as that of the token, then this is a parse
- error. */
- // w/e
-
- } else {
- /* Otherwise, if the current node is an element with
- the same tag name as that of the token pop that element
- from the stack. */
- array_pop($this->stack);
- }
-
- /* In any case, set the form element pointer to null. */
- $this->form_pointer = null;
- break;
-
- /* An end tag whose tag name is "p" */
- case 'p':
- /* If the stack of open elements has a p element in scope,
- then generate implied end tags, except for p elements. */
- if($this->elementInScope('p')) {
- $this->generateImpliedEndTags(array('p'));
-
- /* If the current node is not a p element, then this is
- a parse error. */
- // k
-
- /* If the stack of open elements has a p element in
- scope, then pop elements from this stack until the stack
- no longer has a p element in scope. */
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- if($this->elementInScope('p')) {
- array_pop($this->stack);
-
- } else {
- break;
- }
- }
- }
- break;
-
- /* An end tag whose tag name is "dd", "dt", or "li" */
- case 'dd': case 'dt': case 'li':
- /* If the stack of open elements has an element in scope
- whose tag name matches the tag name of the token, then
- generate implied end tags, except for elements with the
- same tag name as the token. */
- if($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags(array($token['name']));
-
- /* If the current node is not an element with the same
- tag name as the token, then this is a parse error. */
- // w/e
-
- /* If the stack of open elements has an element in scope
- whose tag name matches the tag name of the token, then
- pop elements from this stack until an element with that
- tag name has been popped from the stack. */
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- if($this->stack[$n]->nodeName === $token['name']) {
- $n = -1;
- }
-
- array_pop($this->stack);
- }
- }
- break;
-
- /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
- "h5", "h6" */
- case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
- $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
-
- /* If the stack of open elements has in scope an element whose
- tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
- generate implied end tags. */
- if($this->elementInScope($elements)) {
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not an element with the same
- tag name as that of the token, then this is a parse error. */
- // w/e
-
- /* If the stack of open elements has in scope an element
- whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
- "h6", then pop elements from the stack until an element
- with one of those tag names has been popped from the stack. */
- while($this->elementInScope($elements)) {
- array_pop($this->stack);
- }
- }
- break;
-
- /* An end tag whose tag name is one of: "a", "b", "big", "em",
- "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
- case 'a': case 'b': case 'big': case 'em': case 'font':
- case 'i': case 'nobr': case 's': case 'small': case 'strike':
- case 'strong': case 'tt': case 'u':
- /* 1. Let the formatting element be the last element in
- the list of active formatting elements that:
- * is between the end of the list and the last scope
- marker in the list, if any, or the start of the list
- otherwise, and
- * has the same tag name as the token.
- */
- while(true) {
- for($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
- if($this->a_formatting[$a] === self::MARKER) {
- break;
-
- } elseif($this->a_formatting[$a]->tagName === $token['name']) {
- $formatting_element = $this->a_formatting[$a];
- $in_stack = in_array($formatting_element, $this->stack, true);
- $fe_af_pos = $a;
- break;
- }
- }
-
- /* If there is no such node, or, if that node is
- also in the stack of open elements but the element
- is not in scope, then this is a parse error. Abort
- these steps. The token is ignored. */
- if(!isset($formatting_element) || ($in_stack &&
- !$this->elementInScope($token['name']))) {
- break;
-
- /* Otherwise, if there is such a node, but that node
- is not in the stack of open elements, then this is a
- parse error; remove the element from the list, and
- abort these steps. */
- } elseif(isset($formatting_element) && !$in_stack) {
- unset($this->a_formatting[$fe_af_pos]);
- $this->a_formatting = array_merge($this->a_formatting);
- break;
- }
-
- /* 2. Let the furthest block be the topmost node in the
- stack of open elements that is lower in the stack
- than the formatting element, and is not an element in
- the phrasing or formatting categories. There might
- not be one. */
- $fe_s_pos = array_search($formatting_element, $this->stack, true);
- $length = count($this->stack);
-
- for($s = $fe_s_pos + 1; $s < $length; $s++) {
- $category = $this->getElementCategory($this->stack[$s]->nodeName);
-
- if($category !== self::PHRASING && $category !== self::FORMATTING) {
- $furthest_block = $this->stack[$s];
- }
- }
-
- /* 3. If there is no furthest block, then the UA must
- skip the subsequent steps and instead just pop all
- the nodes from the bottom of the stack of open
- elements, from the current node up to the formatting
- element, and remove the formatting element from the
- list of active formatting elements. */
- if(!isset($furthest_block)) {
- for($n = $length - 1; $n >= $fe_s_pos; $n--) {
- array_pop($this->stack);
- }
-
- unset($this->a_formatting[$fe_af_pos]);
- $this->a_formatting = array_merge($this->a_formatting);
- break;
- }
-
- /* 4. Let the common ancestor be the element
- immediately above the formatting element in the stack
- of open elements. */
- $common_ancestor = $this->stack[$fe_s_pos - 1];
-
- /* 5. If the furthest block has a parent node, then
- remove the furthest block from its parent node. */
- if($furthest_block->parentNode !== null) {
- $furthest_block->parentNode->removeChild($furthest_block);
- }
-
- /* 6. Let a bookmark note the position of the
- formatting element in the list of active formatting
- elements relative to the elements on either side
- of it in the list. */
- $bookmark = $fe_af_pos;
-
- /* 7. Let node and last node be the furthest block.
- Follow these steps: */
- $node = $furthest_block;
- $last_node = $furthest_block;
-
- while(true) {
- for($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
- /* 7.1 Let node be the element immediately
- prior to node in the stack of open elements. */
- $node = $this->stack[$n];
-
- /* 7.2 If node is not in the list of active
- formatting elements, then remove node from
- the stack of open elements and then go back
- to step 1. */
- if(!in_array($node, $this->a_formatting, true)) {
- unset($this->stack[$n]);
- $this->stack = array_merge($this->stack);
-
- } else {
- break;
- }
- }
-
- /* 7.3 Otherwise, if node is the formatting
- element, then go to the next step in the overall
- algorithm. */
- if($node === $formatting_element) {
- break;
-
- /* 7.4 Otherwise, if last node is the furthest
- block, then move the aforementioned bookmark to
- be immediately after the node in the list of
- active formatting elements. */
- } elseif($last_node === $furthest_block) {
- $bookmark = array_search($node, $this->a_formatting, true) + 1;
- }
-
- /* 7.5 If node has any children, perform a
- shallow clone of node, replace the entry for
- node in the list of active formatting elements
- with an entry for the clone, replace the entry
- for node in the stack of open elements with an
- entry for the clone, and let node be the clone. */
- if($node->hasChildNodes()) {
- $clone = $node->cloneNode();
- $s_pos = array_search($node, $this->stack, true);
- $a_pos = array_search($node, $this->a_formatting, true);
-
- $this->stack[$s_pos] = $clone;
- $this->a_formatting[$a_pos] = $clone;
- $node = $clone;
- }
-
- /* 7.6 Insert last node into node, first removing
- it from its previous parent node if any. */
- if($last_node->parentNode !== null) {
- $last_node->parentNode->removeChild($last_node);
- }
-
- $node->appendChild($last_node);
-
- /* 7.7 Let last node be node. */
- $last_node = $node;
- }
-
- /* 8. Insert whatever last node ended up being in
- the previous step into the common ancestor node,
- first removing it from its previous parent node if
- any. */
- if($last_node->parentNode !== null) {
- $last_node->parentNode->removeChild($last_node);
- }
-
- $common_ancestor->appendChild($last_node);
-
- /* 9. Perform a shallow clone of the formatting
- element. */
- $clone = $formatting_element->cloneNode();
-
- /* 10. Take all of the child nodes of the furthest
- block and append them to the clone created in the
- last step. */
- while($furthest_block->hasChildNodes()) {
- $child = $furthest_block->firstChild;
- $furthest_block->removeChild($child);
- $clone->appendChild($child);
- }
-
- /* 11. Append that clone to the furthest block. */
- $furthest_block->appendChild($clone);
-
- /* 12. Remove the formatting element from the list
- of active formatting elements, and insert the clone
- into the list of active formatting elements at the
- position of the aforementioned bookmark. */
- $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
- unset($this->a_formatting[$fe_af_pos]);
- $this->a_formatting = array_merge($this->a_formatting);
-
- $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
- $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
- $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
-
- /* 13. Remove the formatting element from the stack
- of open elements, and insert the clone into the stack
- of open elements immediately after (i.e. in a more
- deeply nested position than) the position of the
- furthest block in that stack. */
- $fe_s_pos = array_search($formatting_element, $this->stack, true);
- $fb_s_pos = array_search($furthest_block, $this->stack, true);
- unset($this->stack[$fe_s_pos]);
-
- $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
- $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
- $this->stack = array_merge($s_part1, array($clone), $s_part2);
-
- /* 14. Jump back to step 1 in this series of steps. */
- unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
- }
- break;
-
- /* An end tag token whose tag name is one of: "button",
- "marquee", "object" */
- case 'button': case 'marquee': case 'object':
- /* If the stack of open elements has an element in scope whose
- tag name matches the tag name of the token, then generate implied
- tags. */
- if($this->elementInScope($token['name'])) {
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not an element with the same
- tag name as the token, then this is a parse error. */
- // k
-
- /* Now, if the stack of open elements has an element in scope
- whose tag name matches the tag name of the token, then pop
- elements from the stack until that element has been popped from
- the stack, and clear the list of active formatting elements up
- to the last marker. */
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- if($this->stack[$n]->nodeName === $token['name']) {
- $n = -1;
- }
-
- array_pop($this->stack);
- }
-
- $marker = end(array_keys($this->a_formatting, self::MARKER, true));
-
- for($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
- array_pop($this->a_formatting);
- }
- }
- break;
-
- /* Or an end tag whose tag name is one of: "area", "basefont",
- "bgsound", "br", "embed", "hr", "iframe", "image", "img",
- "input", "isindex", "noembed", "noframes", "param", "select",
- "spacer", "table", "textarea", "wbr" */
- case 'area': case 'basefont': case 'bgsound': case 'br':
- case 'embed': case 'hr': case 'iframe': case 'image':
- case 'img': case 'input': case 'isindex': case 'noembed':
- case 'noframes': case 'param': case 'select': case 'spacer':
- case 'table': case 'textarea': case 'wbr':
- // Parse error. Ignore the token.
- break;
-
- /* An end tag token not covered by the previous entries */
- default:
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- /* Initialise node to be the current node (the bottommost
- node of the stack). */
- $node = end($this->stack);
-
- /* If node has the same tag name as the end tag token,
- then: */
- if($token['name'] === $node->nodeName) {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* If the tag name of the end tag token does not
- match the tag name of the current node, this is a
- parse error. */
- // k
-
- /* Pop all the nodes from the current node up to
- node, including node, then stop this algorithm. */
- for($x = count($this->stack) - $n; $x >= $n; $x--) {
- array_pop($this->stack);
- }
-
- } else {
- $category = $this->getElementCategory($node);
-
- if($category !== self::SPECIAL && $category !== self::SCOPING) {
- /* Otherwise, if node is in neither the formatting
- category nor the phrasing category, then this is a
- parse error. Stop this algorithm. The end tag token
- is ignored. */
- return false;
- }
- }
- }
- break;
- }
- break;
- }
- }
-
- private function inTable($token) {
- $clear = array('html', 'table');
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append the character to the current node. */
- $text = $this->dom->createTextNode($token['data']);
- end($this->stack)->appendChild($text);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- end($this->stack)->appendChild($comment);
-
- /* A start tag whose tag name is "caption" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'caption') {
- /* Clear the stack back to a table context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert a marker at the end of the list of active
- formatting elements. */
- $this->a_formatting[] = self::MARKER;
-
- /* Insert an HTML element for the token, then switch the
- insertion mode to "in caption". */
- $this->insertElement($token);
- $this->mode = self::IN_CAPTION;
-
- /* A start tag whose tag name is "colgroup" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'colgroup') {
- /* Clear the stack back to a table context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert an HTML element for the token, then switch the
- insertion mode to "in column group". */
- $this->insertElement($token);
- $this->mode = self::IN_CGROUP;
-
- /* A start tag whose tag name is "col" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'col') {
- $this->inTable(array(
- 'name' => 'colgroup',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- $this->inColumnGroup($token);
-
- /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
- } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('tbody', 'tfoot', 'thead'))) {
- /* Clear the stack back to a table context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert an HTML element for the token, then switch the insertion
- mode to "in table body". */
- $this->insertElement($token);
- $this->mode = self::IN_TBODY;
-
- /* A start tag whose tag name is one of: "td", "th", "tr" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- in_array($token['name'], array('td', 'th', 'tr'))) {
- /* Act as if a start tag token with the tag name "tbody" had been
- seen, then reprocess the current token. */
- $this->inTable(array(
- 'name' => 'tbody',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- return $this->inTableBody($token);
-
- /* A start tag whose tag name is "table" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'table') {
- /* Parse error. Act as if an end tag token with the tag name "table"
- had been seen, then, if that token wasn't ignored, reprocess the
- current token. */
- $this->inTable(array(
- 'name' => 'table',
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->mainPhase($token);
-
- /* An end tag whose tag name is "table" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'table') {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if(!$this->elementInScope($token['name'], true)) {
- return false;
-
- /* Otherwise: */
- } else {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not a table element, then this
- is a parse error. */
- // w/e
-
- /* Pop elements from this stack until a table element has been
- popped from the stack. */
- while(true) {
- $current = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if($current === 'table') {
- break;
- }
- }
-
- /* Reset the insertion mode appropriately. */
- $this->resetInsertionMode();
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html', 'tbody', 'td',
- 'tfoot', 'th', 'thead', 'tr'))) {
- // Parse error. Ignore the token.
-
- /* Anything else */
- } else {
- /* Parse error. Process the token as if the insertion mode was "in
- body", with the following exception: */
-
- /* If the current node is a table, tbody, tfoot, thead, or tr
- element, then, whenever a node would be inserted into the current
- node, it must instead be inserted into the foster parent element. */
- if(in_array(end($this->stack)->nodeName,
- array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
- /* The foster parent element is the parent element of the last
- table element in the stack of open elements, if there is a
- table element and it has such a parent element. If there is no
- table element in the stack of open elements (innerHTML case),
- then the foster parent element is the first element in the
- stack of open elements (the html element). Otherwise, if there
- is a table element in the stack of open elements, but the last
- table element in the stack of open elements has no parent, or
- its parent node is not an element, then the foster parent
- element is the element before the last table element in the
- stack of open elements. */
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- if($this->stack[$n]->nodeName === 'table') {
- $table = $this->stack[$n];
- break;
- }
- }
-
- if(isset($table) && $table->parentNode !== null) {
- $this->foster_parent = $table->parentNode;
-
- } elseif(!isset($table)) {
- $this->foster_parent = $this->stack[0];
-
- } elseif(isset($table) && ($table->parentNode === null ||
- $table->parentNode->nodeType !== XML_ELEMENT_NODE)) {
- $this->foster_parent = $this->stack[$n - 1];
- }
- }
-
- $this->inBody($token);
- }
- }
-
- private function inCaption($token) {
- /* An end tag whose tag name is "caption" */
- if($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if(!$this->elementInScope($token['name'], true)) {
- // Ignore
-
- /* Otherwise: */
- } else {
- /* Generate implied end tags. */
- $this->generateImpliedEndTags();
-
- /* Now, if the current node is not a caption element, then this
- is a parse error. */
- // w/e
-
- /* Pop elements from this stack until a caption element has
- been popped from the stack. */
- while(true) {
- $node = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if($node === 'caption') {
- break;
- }
- }
-
- /* Clear the list of active formatting elements up to the last
- marker. */
- $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
- /* Switch the insertion mode to "in table". */
- $this->mode = self::IN_TABLE;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
- name is "table" */
- } elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
- 'thead', 'tr'))) || ($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'table')) {
- /* Parse error. Act as if an end tag with the tag name "caption"
- had been seen, then, if that token wasn't ignored, reprocess the
- current token. */
- $this->inCaption(array(
- 'name' => 'caption',
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->inTable($token);
-
- /* An end tag whose tag name is one of: "body", "col", "colgroup",
- "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
- array('body', 'col', 'colgroup', 'html', 'tbody', 'tfoot', 'th',
- 'thead', 'tr'))) {
- // Parse error. Ignore the token.
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in body". */
- $this->inBody($token);
- }
- }
-
- private function inColumnGroup($token) {
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append the character to the current node. */
- $text = $this->dom->createTextNode($token['data']);
- end($this->stack)->appendChild($text);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- end($this->stack)->appendChild($comment);
-
- /* A start tag whose tag name is "col" */
- } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
- /* Insert a col element for the token. Immediately pop the current
- node off the stack of open elements. */
- $this->insertElement($token);
- array_pop($this->stack);
-
- /* An end tag whose tag name is "colgroup" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'colgroup') {
- /* If the current node is the root html element, then this is a
- parse error, ignore the token. (innerHTML case) */
- if(end($this->stack)->nodeName === 'html') {
- // Ignore
-
- /* Otherwise, pop the current node (which will be a colgroup
- element) from the stack of open elements. Switch the insertion
- mode to "in table". */
- } else {
- array_pop($this->stack);
- $this->mode = self::IN_TABLE;
- }
-
- /* An end tag whose tag name is "col" */
- } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
- /* Parse error. Ignore the token. */
-
- /* Anything else */
- } else {
- /* Act as if an end tag with the tag name "colgroup" had been seen,
- and then, if that token wasn't ignored, reprocess the current token. */
- $this->inColumnGroup(array(
- 'name' => 'colgroup',
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->inTable($token);
- }
- }
-
- private function inTableBody($token) {
- $clear = array('tbody', 'tfoot', 'thead', 'html');
-
- /* A start tag whose tag name is "tr" */
- if($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
- /* Clear the stack back to a table body context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert a tr element for the token, then switch the insertion
- mode to "in row". */
- $this->insertElement($token);
- $this->mode = self::IN_ROW;
-
- /* A start tag whose tag name is one of: "th", "td" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- ($token['name'] === 'th' || $token['name'] === 'td')) {
- /* Parse error. Act as if a start tag with the tag name "tr" had
- been seen, then reprocess the current token. */
- $this->inTableBody(array(
- 'name' => 'tr',
- 'type' => HTML5::STARTTAG,
- 'attr' => array()
- ));
-
- return $this->inRow($token);
-
- /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- in_array($token['name'], array('tbody', 'tfoot', 'thead'))) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. */
- if(!$this->elementInScope($token['name'], true)) {
- // Ignore
-
- /* Otherwise: */
- } else {
- /* Clear the stack back to a table body context. */
- $this->clearStackToTableContext($clear);
-
- /* Pop the current node from the stack of open elements. Switch
- the insertion mode to "in table". */
- array_pop($this->stack);
- $this->mode = self::IN_TABLE;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
- } elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead'))) ||
- ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')) {
- /* If the stack of open elements does not have a tbody, thead, or
- tfoot element in table scope, this is a parse error. Ignore the
- token. (innerHTML case) */
- if(!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Clear the stack back to a table body context. */
- $this->clearStackToTableContext($clear);
-
- /* Act as if an end tag with the same tag name as the current
- node ("tbody", "tfoot", or "thead") had been seen, then
- reprocess the current token. */
- $this->inTableBody(array(
- 'name' => end($this->stack)->nodeName,
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->mainPhase($token);
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html", "td", "th", "tr" */
- } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
- /* Parse error. Ignore the token. */
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in table". */
- $this->inTable($token);
- }
- }
-
- private function inRow($token) {
- $clear = array('tr', 'html');
-
- /* A start tag whose tag name is one of: "th", "td" */
- if($token['type'] === HTML5::STARTTAG &&
- ($token['name'] === 'th' || $token['name'] === 'td')) {
- /* Clear the stack back to a table row context. */
- $this->clearStackToTableContext($clear);
-
- /* Insert an HTML element for the token, then switch the insertion
- mode to "in cell". */
- $this->insertElement($token);
- $this->mode = self::IN_CELL;
-
- /* Insert a marker at the end of the list of active formatting
- elements. */
- $this->a_formatting[] = self::MARKER;
-
- /* An end tag whose tag name is "tr" */
- } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if(!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Clear the stack back to a table row context. */
- $this->clearStackToTableContext($clear);
-
- /* Pop the current node (which will be a tr element) from the
- stack of open elements. Switch the insertion mode to "in table
- body". */
- array_pop($this->stack);
- $this->mode = self::IN_TBODY;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
- } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr'))) {
- /* Act as if an end tag with the tag name "tr" had been seen, then,
- if that token wasn't ignored, reprocess the current token. */
- $this->inRow(array(
- 'name' => 'tr',
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->inCell($token);
-
- /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- in_array($token['name'], array('tbody', 'tfoot', 'thead'))) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. */
- if(!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Otherwise, act as if an end tag with the tag name "tr" had
- been seen, then reprocess the current token. */
- $this->inRow(array(
- 'name' => 'tr',
- 'type' => HTML5::ENDTAG
- ));
-
- return $this->inCell($token);
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html", "td", "th" */
- } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
- /* Parse error. Ignore the token. */
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in table". */
- $this->inTable($token);
- }
- }
-
- private function inCell($token) {
- /* An end tag whose tag name is one of: "td", "th" */
- if($token['type'] === HTML5::ENDTAG &&
- ($token['name'] === 'td' || $token['name'] === 'th')) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as that of the token, then this is a
- parse error and the token must be ignored. */
- if(!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise: */
- } else {
- /* Generate implied end tags, except for elements with the same
- tag name as the token. */
- $this->generateImpliedEndTags(array($token['name']));
-
- /* Now, if the current node is not an element with the same tag
- name as the token, then this is a parse error. */
- // k
-
- /* Pop elements from this stack until an element with the same
- tag name as the token has been popped from the stack. */
- while(true) {
- $node = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if($node === $token['name']) {
- break;
- }
- }
-
- /* Clear the list of active formatting elements up to the last
- marker. */
- $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
- /* Switch the insertion mode to "in row". (The current node
- will be a tr element at this point.) */
- $this->mode = self::IN_ROW;
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
- 'thead', 'tr'))) {
- /* If the stack of open elements does not have a td or th element
- in table scope, then this is a parse error; ignore the token.
- (innerHTML case) */
- if(!$this->elementInScope(array('td', 'th'), true)) {
- // Ignore.
-
- /* Otherwise, close the cell (see below) and reprocess the current
- token. */
- } else {
- $this->closeCell();
- return $this->inRow($token);
- }
-
- /* A start tag whose tag name is one of: "caption", "col", "colgroup",
- "tbody", "td", "tfoot", "th", "thead", "tr" */
- } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
- array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
- 'thead', 'tr'))) {
- /* If the stack of open elements does not have a td or th element
- in table scope, then this is a parse error; ignore the token.
- (innerHTML case) */
- if(!$this->elementInScope(array('td', 'th'), true)) {
- // Ignore.
-
- /* Otherwise, close the cell (see below) and reprocess the current
- token. */
- } else {
- $this->closeCell();
- return $this->inRow($token);
- }
-
- /* An end tag whose tag name is one of: "body", "caption", "col",
- "colgroup", "html" */
- } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
- array('body', 'caption', 'col', 'colgroup', 'html'))) {
- /* Parse error. Ignore the token. */
-
- /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
- "thead", "tr" */
- } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
- array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as that of the token (which can only
- happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
- then this is a parse error and the token must be ignored. */
- if(!$this->elementInScope($token['name'], true)) {
- // Ignore.
-
- /* Otherwise, close the cell (see below) and reprocess the current
- token. */
- } else {
- $this->closeCell();
- return $this->inRow($token);
- }
-
- /* Anything else */
- } else {
- /* Process the token as if the insertion mode was "in body". */
- $this->inBody($token);
- }
- }
-
- private function inSelect($token) {
- /* Handle the token as follows: */
-
- /* A character token */
- if($token['type'] === HTML5::CHARACTR) {
- /* Append the token's character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag token whose tag name is "option" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'option') {
- /* If the current node is an option element, act as if an end tag
- with the tag name "option" had been seen. */
- if(end($this->stack)->nodeName === 'option') {
- $this->inSelect(array(
- 'name' => 'option',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* A start tag token whose tag name is "optgroup" */
- } elseif($token['type'] === HTML5::STARTTAG &&
- $token['name'] === 'optgroup') {
- /* If the current node is an option element, act as if an end tag
- with the tag name "option" had been seen. */
- if(end($this->stack)->nodeName === 'option') {
- $this->inSelect(array(
- 'name' => 'option',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* If the current node is an optgroup element, act as if an end tag
- with the tag name "optgroup" had been seen. */
- if(end($this->stack)->nodeName === 'optgroup') {
- $this->inSelect(array(
- 'name' => 'optgroup',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* An end tag token whose tag name is "optgroup" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'optgroup') {
- /* First, if the current node is an option element, and the node
- immediately before it in the stack of open elements is an optgroup
- element, then act as if an end tag with the tag name "option" had
- been seen. */
- $elements_in_stack = count($this->stack);
-
- if($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
- $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup') {
- $this->inSelect(array(
- 'name' => 'option',
- 'type' => HTML5::ENDTAG
- ));
- }
-
- /* If the current node is an optgroup element, then pop that node
- from the stack of open elements. Otherwise, this is a parse error,
- ignore the token. */
- if($this->stack[$elements_in_stack - 1] === 'optgroup') {
- array_pop($this->stack);
- }
-
- /* An end tag token whose tag name is "option" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'option') {
- /* If the current node is an option element, then pop that node
- from the stack of open elements. Otherwise, this is a parse error,
- ignore the token. */
- if(end($this->stack)->nodeName === 'option') {
- array_pop($this->stack);
- }
-
- /* An end tag whose tag name is "select" */
- } elseif($token['type'] === HTML5::ENDTAG &&
- $token['name'] === 'select') {
- /* If the stack of open elements does not have an element in table
- scope with the same tag name as the token, this is a parse error.
- Ignore the token. (innerHTML case) */
- if(!$this->elementInScope($token['name'], true)) {
- // w/e
-
- /* Otherwise: */
- } else {
- /* Pop elements from the stack of open elements until a select
- element has been popped from the stack. */
- while(true) {
- $current = end($this->stack)->nodeName;
- array_pop($this->stack);
-
- if($current === 'select') {
- break;
- }
- }
-
- /* Reset the insertion mode appropriately. */
- $this->resetInsertionMode();
- }
-
- /* A start tag whose tag name is "select" */
- } elseif($token['name'] === 'select' &&
- $token['type'] === HTML5::STARTTAG) {
- /* Parse error. Act as if the token had been an end tag with the
- tag name "select" instead. */
- $this->inSelect(array(
- 'name' => 'select',
- 'type' => HTML5::ENDTAG
- ));
-
- /* An end tag whose tag name is one of: "caption", "table", "tbody",
- "tfoot", "thead", "tr", "td", "th" */
- } elseif(in_array($token['name'], array('caption', 'table', 'tbody',
- 'tfoot', 'thead', 'tr', 'td', 'th')) && $token['type'] === HTML5::ENDTAG) {
- /* Parse error. */
- // w/e
-
- /* If the stack of open elements has an element in table scope with
- the same tag name as that of the token, then act as if an end tag
- with the tag name "select" had been seen, and reprocess the token.
- Otherwise, ignore the token. */
- if($this->elementInScope($token['name'], true)) {
- $this->inSelect(array(
- 'name' => 'select',
- 'type' => HTML5::ENDTAG
- ));
-
- $this->mainPhase($token);
- }
-
- /* Anything else */
- } else {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function afterBody($token) {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Process the token as it would be processed if the insertion mode
- was "in body". */
- $this->inBody($token);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the first element in the stack of open
- elements (the html element), with the data attribute set to the
- data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- $this->stack[0]->appendChild($comment);
-
- /* An end tag with the tag name "html" */
- } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
- /* If the parser was originally created in order to handle the
- setting of an element's innerHTML attribute, this is a parse error;
- ignore the token. (The element will be an html element in this
- case.) (innerHTML case) */
-
- /* Otherwise, switch to the trailing end phase. */
- $this->phase = self::END_PHASE;
-
- /* Anything else */
- } else {
- /* Parse error. Set the insertion mode to "in body" and reprocess
- the token. */
- $this->mode = self::IN_BODY;
- return $this->inBody($token);
- }
- }
-
- private function inFrameset($token) {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* A start tag with the tag name "frameset" */
- } elseif($token['name'] === 'frameset' &&
- $token['type'] === HTML5::STARTTAG) {
- $this->insertElement($token);
-
- /* An end tag with the tag name "frameset" */
- } elseif($token['name'] === 'frameset' &&
- $token['type'] === HTML5::ENDTAG) {
- /* If the current node is the root html element, then this is a
- parse error; ignore the token. (innerHTML case) */
- if(end($this->stack)->nodeName === 'html') {
- // Ignore
-
- } else {
- /* Otherwise, pop the current node from the stack of open
- elements. */
- array_pop($this->stack);
-
- /* If the parser was not originally created in order to handle
- the setting of an element's innerHTML attribute (innerHTML case),
- and the current node is no longer a frameset element, then change
- the insertion mode to "after frameset". */
- $this->mode = self::AFTR_FRAME;
- }
-
- /* A start tag with the tag name "frame" */
- } elseif($token['name'] === 'frame' &&
- $token['type'] === HTML5::STARTTAG) {
- /* Insert an HTML element for the token. */
- $this->insertElement($token);
-
- /* Immediately pop the current node off the stack of open elements. */
- array_pop($this->stack);
-
- /* A start tag with the tag name "noframes" */
- } elseif($token['name'] === 'noframes' &&
- $token['type'] === HTML5::STARTTAG) {
- /* Process the token as if the insertion mode had been "in body". */
- $this->inBody($token);
-
- /* Anything else */
- } else {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function afterFrameset($token) {
- /* Handle the token as follows: */
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
- if($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Append the character to the current node. */
- $this->insertText($token['data']);
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the current node with the data
- attribute set to the data given in the comment token. */
- $this->insertComment($token['data']);
-
- /* An end tag with the tag name "html" */
- } elseif($token['name'] === 'html' &&
- $token['type'] === HTML5::ENDTAG) {
- /* Switch to the trailing end phase. */
- $this->phase = self::END_PHASE;
-
- /* A start tag with the tag name "noframes" */
- } elseif($token['name'] === 'noframes' &&
- $token['type'] === HTML5::STARTTAG) {
- /* Process the token as if the insertion mode had been "in body". */
- $this->inBody($token);
-
- /* Anything else */
- } else {
- /* Parse error. Ignore the token. */
- }
- }
-
- private function trailingEndPhase($token) {
- /* After the main phase, as each token is emitted from the tokenisation
- stage, it must be processed as described in this section. */
-
- /* A DOCTYPE token */
- if($token['type'] === HTML5::DOCTYPE) {
- // Parse error. Ignore the token.
-
- /* A comment token */
- } elseif($token['type'] === HTML5::COMMENT) {
- /* Append a Comment node to the Document object with the data
- attribute set to the data given in the comment token. */
- $comment = $this->dom->createComment($token['data']);
- $this->dom->appendChild($comment);
-
- /* A character token that is one of one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE */
- } elseif($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
- /* Process the token as it would be processed in the main phase. */
- $this->mainPhase($token);
-
- /* A character token that is not one of U+0009 CHARACTER TABULATION,
- U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
- or U+0020 SPACE. Or a start tag token. Or an end tag token. */
- } elseif(($token['type'] === HTML5::CHARACTR &&
- preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
- $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG) {
- /* Parse error. Switch back to the main phase and reprocess the
- token. */
- $this->phase = self::MAIN_PHASE;
- return $this->mainPhase($token);
-
- /* An end-of-file token */
- } elseif($token['type'] === HTML5::EOF) {
- /* OMG DONE!! */
- }
- }
-
- private function insertElement($token, $append = true, $check = false) {
- // Proprietary workaround for libxml2's limitations with tag names
- if ($check) {
- // Slightly modified HTML5 tag-name modification,
- // removing anything that's not an ASCII letter, digit, or hyphen
- $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
- // Remove leading hyphens and numbers
- $token['name'] = ltrim($token['name'], '-0..9');
- // In theory, this should ever be needed, but just in case
- if ($token['name'] === '') $token['name'] = 'span'; // arbitrary generic choice
- }
-
- $el = $this->dom->createElement($token['name']);
-
- foreach($token['attr'] as $attr) {
- if(!$el->hasAttribute($attr['name'])) {
- $el->setAttribute($attr['name'], $attr['value']);
- }
- }
-
- $this->appendToRealParent($el);
- $this->stack[] = $el;
-
- return $el;
- }
-
- private function insertText($data) {
- $text = $this->dom->createTextNode($data);
- $this->appendToRealParent($text);
- }
-
- private function insertComment($data) {
- $comment = $this->dom->createComment($data);
- $this->appendToRealParent($comment);
- }
-
- private function appendToRealParent($node) {
- if($this->foster_parent === null) {
- end($this->stack)->appendChild($node);
-
- } elseif($this->foster_parent !== null) {
- /* If the foster parent element is the parent element of the
- last table element in the stack of open elements, then the new
- node must be inserted immediately before the last table element
- in the stack of open elements in the foster parent element;
- otherwise, the new node must be appended to the foster parent
- element. */
- for($n = count($this->stack) - 1; $n >= 0; $n--) {
- if($this->stack[$n]->nodeName === 'table' &&
- $this->stack[$n]->parentNode !== null) {
- $table = $this->stack[$n];
- break;
- }
- }
-
- if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
- $this->foster_parent->insertBefore($node, $table);
- else
- $this->foster_parent->appendChild($node);
-
- $this->foster_parent = null;
- }
- }
-
- private function elementInScope($el, $table = false) {
- if(is_array($el)) {
- foreach($el as $element) {
- if($this->elementInScope($element, $table)) {
- return true;
- }
- }
-
- return false;
- }
-
- $leng = count($this->stack);
-
- for($n = 0; $n < $leng; $n++) {
- /* 1. Initialise node to be the current node (the bottommost node of
- the stack). */
- $node = $this->stack[$leng - 1 - $n];
-
- if($node->tagName === $el) {
- /* 2. If node is the target node, terminate in a match state. */
- return true;
-
- } elseif($node->tagName === 'table') {
- /* 3. Otherwise, if node is a table element, terminate in a failure
- state. */
- return false;
-
- } elseif($table === true && in_array($node->tagName, array('caption', 'td',
- 'th', 'button', 'marquee', 'object'))) {
- /* 4. Otherwise, if the algorithm is the "has an element in scope"
- variant (rather than the "has an element in table scope" variant),
- and node is one of the following, terminate in a failure state. */
- return false;
-
- } elseif($node === $node->ownerDocument->documentElement) {
- /* 5. Otherwise, if node is an html element (root element), terminate
- in a failure state. (This can only happen if the node is the topmost
- node of the stack of open elements, and prevents the next step from
- being invoked if there are no more elements in the stack.) */
- return false;
- }
-
- /* Otherwise, set node to the previous entry in the stack of open
- elements and return to step 2. (This will never fail, since the loop
- will always terminate in the previous step if the top of the stack
- is reached.) */
- }
- }
-
- private function reconstructActiveFormattingElements() {
- /* 1. If there are no entries in the list of active formatting elements,
- then there is nothing to reconstruct; stop this algorithm. */
- $formatting_elements = count($this->a_formatting);
-
- if($formatting_elements === 0) {
- return false;
- }
-
- /* 3. Let entry be the last (most recently added) element in the list
- of active formatting elements. */
- $entry = end($this->a_formatting);
-
- /* 2. If the last (most recently added) entry in the list of active
- formatting elements is a marker, or if it is an element that is in the
- stack of open elements, then there is nothing to reconstruct; stop this
- algorithm. */
- if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
- return false;
- }
-
- for($a = $formatting_elements - 1; $a >= 0; true) {
- /* 4. If there are no entries before entry in the list of active
- formatting elements, then jump to step 8. */
- if($a === 0) {
- $step_seven = false;
- break;
- }
-
- /* 5. Let entry be the entry one earlier than entry in the list of
- active formatting elements. */
- $a--;
- $entry = $this->a_formatting[$a];
-
- /* 6. If entry is neither a marker nor an element that is also in
- thetack of open elements, go to step 4. */
- if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
- break;
- }
- }
-
- while(true) {
- /* 7. Let entry be the element one later than entry in the list of
- active formatting elements. */
- if(isset($step_seven) && $step_seven === true) {
- $a++;
- $entry = $this->a_formatting[$a];
- }
-
- /* 8. Perform a shallow clone of the element entry to obtain clone. */
- $clone = $entry->cloneNode();
-
- /* 9. Append clone to the current node and push it onto the stack
- of open elements so that it is the new current node. */
- end($this->stack)->appendChild($clone);
- $this->stack[] = $clone;
-
- /* 10. Replace the entry for entry in the list with an entry for
- clone. */
- $this->a_formatting[$a] = $clone;
-
- /* 11. If the entry for clone in the list of active formatting
- elements is not the last entry in the list, return to step 7. */
- if(end($this->a_formatting) !== $clone) {
- $step_seven = true;
- } else {
- break;
- }
- }
- }
-
- private function clearTheActiveFormattingElementsUpToTheLastMarker() {
- /* When the steps below require the UA to clear the list of active
- formatting elements up to the last marker, the UA must perform the
- following steps: */
-
- while(true) {
- /* 1. Let entry be the last (most recently added) entry in the list
- of active formatting elements. */
- $entry = end($this->a_formatting);
-
- /* 2. Remove entry from the list of active formatting elements. */
- array_pop($this->a_formatting);
-
- /* 3. If entry was a marker, then stop the algorithm at this point.
- The list has been cleared up to the last marker. */
- if($entry === self::MARKER) {
- break;
- }
- }
- }
-
- private function generateImpliedEndTags($exclude = array()) {
- /* When the steps below require the UA to generate implied end tags,
- then, if the current node is a dd element, a dt element, an li element,
- a p element, a td element, a th element, or a tr element, the UA must
- act as if an end tag with the respective tag name had been seen and
- then generate implied end tags again. */
- $node = end($this->stack);
- $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
-
- while(in_array(end($this->stack)->nodeName, $elements)) {
- array_pop($this->stack);
- }
- }
-
- private function getElementCategory($node) {
- $name = $node->tagName;
- if(in_array($name, $this->special))
- return self::SPECIAL;
-
- elseif(in_array($name, $this->scoping))
- return self::SCOPING;
-
- elseif(in_array($name, $this->formatting))
- return self::FORMATTING;
-
- else
- return self::PHRASING;
- }
-
- private function clearStackToTableContext($elements) {
- /* When the steps above require the UA to clear the stack back to a
- table context, it means that the UA must, while the current node is not
- a table element or an html element, pop elements from the stack of open
- elements. If this causes any elements to be popped from the stack, then
- this is a parse error. */
- while(true) {
- $node = end($this->stack)->nodeName;
-
- if(in_array($node, $elements)) {
- break;
- } else {
- array_pop($this->stack);
- }
- }
- }
-
- private function resetInsertionMode() {
- /* 1. Let last be false. */
- $last = false;
- $leng = count($this->stack);
-
- for($n = $leng - 1; $n >= 0; $n--) {
- /* 2. Let node be the last node in the stack of open elements. */
- $node = $this->stack[$n];
-
- /* 3. If node is the first node in the stack of open elements, then
- set last to true. If the element whose innerHTML attribute is being
- set is neither a td element nor a th element, then set node to the
- element whose innerHTML attribute is being set. (innerHTML case) */
- if($this->stack[0]->isSameNode($node)) {
- $last = true;
- }
-
- /* 4. If node is a select element, then switch the insertion mode to
- "in select" and abort these steps. (innerHTML case) */
- if($node->nodeName === 'select') {
- $this->mode = self::IN_SELECT;
- break;
-
- /* 5. If node is a td or th element, then switch the insertion mode
- to "in cell" and abort these steps. */
- } elseif($node->nodeName === 'td' || $node->nodeName === 'th') {
- $this->mode = self::IN_CELL;
- break;
-
- /* 6. If node is a tr element, then switch the insertion mode to
- "in row" and abort these steps. */
- } elseif($node->nodeName === 'tr') {
- $this->mode = self::IN_ROW;
- break;
-
- /* 7. If node is a tbody, thead, or tfoot element, then switch the
- insertion mode to "in table body" and abort these steps. */
- } elseif(in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
- $this->mode = self::IN_TBODY;
- break;
-
- /* 8. If node is a caption element, then switch the insertion mode
- to "in caption" and abort these steps. */
- } elseif($node->nodeName === 'caption') {
- $this->mode = self::IN_CAPTION;
- break;
-
- /* 9. If node is a colgroup element, then switch the insertion mode
- to "in column group" and abort these steps. (innerHTML case) */
- } elseif($node->nodeName === 'colgroup') {
- $this->mode = self::IN_CGROUP;
- break;
-
- /* 10. If node is a table element, then switch the insertion mode
- to "in table" and abort these steps. */
- } elseif($node->nodeName === 'table') {
- $this->mode = self::IN_TABLE;
- break;
-
- /* 11. If node is a head element, then switch the insertion mode
- to "in body" ("in body"! not "in head"!) and abort these steps.
- (innerHTML case) */
- } elseif($node->nodeName === 'head') {
- $this->mode = self::IN_BODY;
- break;
-
- /* 12. If node is a body element, then switch the insertion mode to
- "in body" and abort these steps. */
- } elseif($node->nodeName === 'body') {
- $this->mode = self::IN_BODY;
- break;
-
- /* 13. If node is a frameset element, then switch the insertion
- mode to "in frameset" and abort these steps. (innerHTML case) */
- } elseif($node->nodeName === 'frameset') {
- $this->mode = self::IN_FRAME;
- break;
-
- /* 14. If node is an html element, then: if the head element
- pointer is null, switch the insertion mode to "before head",
- otherwise, switch the insertion mode to "after head". In either
- case, abort these steps. (innerHTML case) */
- } elseif($node->nodeName === 'html') {
- $this->mode = ($this->head_pointer === null)
- ? self::BEFOR_HEAD
- : self::AFTER_HEAD;
-
- break;
-
- /* 15. If last is true, then set the insertion mode to "in body"
- and abort these steps. (innerHTML case) */
- } elseif($last) {
- $this->mode = self::IN_BODY;
- break;
- }
- }
- }
-
- private function closeCell() {
- /* If the stack of open elements has a td or th element in table scope,
- then act as if an end tag token with that tag name had been seen. */
- foreach(array('td', 'th') as $cell) {
- if($this->elementInScope($cell, true)) {
- $this->inCell(array(
- 'name' => $cell,
- 'type' => HTML5::ENDTAG
- ));
-
- break;
- }
- }
- }
-
- public function save() {
- return $this->dom;
- }
-}
-?>
diff --git a/extlib/HTMLPurifier/HTMLPurifier/PercentEncoder.php b/extlib/HTMLPurifier/HTMLPurifier/PercentEncoder.php
deleted file mode 100644
index a43c44f4c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/PercentEncoder.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Class that handles operations involving percent-encoding in URIs.
- *
- * @warning
- * Be careful when reusing instances of PercentEncoder. The object
- * you use for normalize() SHOULD NOT be used for encode(), or
- * vice-versa.
- */
-class HTMLPurifier_PercentEncoder
-{
-
- /**
- * Reserved characters to preserve when using encode().
- */
- protected $preserve = array();
-
- /**
- * String of characters that should be preserved while using encode().
- */
- public function __construct($preserve = false) {
- // unreserved letters, ought to const-ify
- for ($i = 48; $i <= 57; $i++) $this->preserve[$i] = true; // digits
- for ($i = 65; $i <= 90; $i++) $this->preserve[$i] = true; // upper-case
- for ($i = 97; $i <= 122; $i++) $this->preserve[$i] = true; // lower-case
- $this->preserve[45] = true; // Dash -
- $this->preserve[46] = true; // Period .
- $this->preserve[95] = true; // Underscore _
- $this->preserve[126]= true; // Tilde ~
-
- // extra letters not to escape
- if ($preserve !== false) {
- for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
- $this->preserve[ord($preserve[$i])] = true;
- }
- }
- }
-
- /**
- * Our replacement for urlencode, it encodes all non-reserved characters,
- * as well as any extra characters that were instructed to be preserved.
- * @note
- * Assumes that the string has already been normalized, making any
- * and all percent escape sequences valid. Percents will not be
- * re-escaped, regardless of their status in $preserve
- * @param $string String to be encoded
- * @return Encoded string.
- */
- public function encode($string) {
- $ret = '';
- for ($i = 0, $c = strlen($string); $i < $c; $i++) {
- if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])]) ) {
- $ret .= '%' . sprintf('%02X', $int);
- } else {
- $ret .= $string[$i];
- }
- }
- return $ret;
- }
-
- /**
- * Fix up percent-encoding by decoding unreserved characters and normalizing.
- * @warning This function is affected by $preserve, even though the
- * usual desired behavior is for this not to preserve those
- * characters. Be careful when reusing instances of PercentEncoder!
- * @param $string String to normalize
- */
- public function normalize($string) {
- if ($string == '') return '';
- $parts = explode('%', $string);
- $ret = array_shift($parts);
- foreach ($parts as $part) {
- $length = strlen($part);
- if ($length < 2) {
- $ret .= '%25' . $part;
- continue;
- }
- $encoding = substr($part, 0, 2);
- $text = substr($part, 2);
- if (!ctype_xdigit($encoding)) {
- $ret .= '%25' . $part;
- continue;
- }
- $int = hexdec($encoding);
- if (isset($this->preserve[$int])) {
- $ret .= chr($int) . $text;
- continue;
- }
- $encoding = strtoupper($encoding);
- $ret .= '%' . $encoding . $text;
- }
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Printer.php b/extlib/HTMLPurifier/HTMLPurifier/Printer.php
deleted file mode 100644
index e7eb82e83..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Printer.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-// OUT OF DATE, NEEDS UPDATING!
-// USE XMLWRITER!
-
-class HTMLPurifier_Printer
-{
-
- /**
- * Instance of HTMLPurifier_Generator for HTML generation convenience funcs
- */
- protected $generator;
-
- /**
- * Instance of HTMLPurifier_Config, for easy access
- */
- protected $config;
-
- /**
- * Initialize $generator.
- */
- public function __construct() {
- }
-
- /**
- * Give generator necessary configuration if possible
- */
- public function prepareGenerator($config) {
- $all = $config->getAll();
- $context = new HTMLPurifier_Context();
- $this->generator = new HTMLPurifier_Generator($config, $context);
- }
-
- /**
- * Main function that renders object or aspect of that object
- * @note Parameters vary depending on printer
- */
- // function render() {}
-
- /**
- * Returns a start tag
- * @param $tag Tag name
- * @param $attr Attribute array
- */
- protected function start($tag, $attr = array()) {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
- );
- }
-
- /**
- * Returns an end teg
- * @param $tag Tag name
- */
- protected function end($tag) {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_End($tag)
- );
- }
-
- /**
- * Prints a complete element with content inside
- * @param $tag Tag name
- * @param $contents Element contents
- * @param $attr Tag attributes
- * @param $escape Bool whether or not to escape contents
- */
- protected function element($tag, $contents, $attr = array(), $escape = true) {
- return $this->start($tag, $attr) .
- ($escape ? $this->escape($contents) : $contents) .
- $this->end($tag);
- }
-
- protected function elementEmpty($tag, $attr = array()) {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_Empty($tag, $attr)
- );
- }
-
- protected function text($text) {
- return $this->generator->generateFromToken(
- new HTMLPurifier_Token_Text($text)
- );
- }
-
- /**
- * Prints a simple key/value row in a table.
- * @param $name Key
- * @param $value Value
- */
- protected function row($name, $value) {
- if (is_bool($value)) $value = $value ? 'On' : 'Off';
- return
- $this->start('tr') . "\n" .
- $this->element('th', $name) . "\n" .
- $this->element('td', $value) . "\n" .
- $this->end('tr')
- ;
- }
-
- /**
- * Escapes a string for HTML output.
- * @param $string String to escape
- */
- protected function escape($string) {
- $string = HTMLPurifier_Encoder::cleanUTF8($string);
- $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
- return $string;
- }
-
- /**
- * Takes a list of strings and turns them into a single list
- * @param $array List of strings
- * @param $polite Bool whether or not to add an end before the last
- */
- protected function listify($array, $polite = false) {
- if (empty($array)) return 'None';
- $ret = '';
- $i = count($array);
- foreach ($array as $value) {
- $i--;
- $ret .= $value;
- if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';
- if ($polite && $i == 1) $ret .= 'and ';
- }
- return $ret;
- }
-
- /**
- * Retrieves the class of an object without prefixes, as well as metadata
- * @param $obj Object to determine class of
- * @param $prefix Further prefix to remove
- */
- protected function getClass($obj, $sec_prefix = '') {
- static $five = null;
- if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
- $prefix = 'HTMLPurifier_' . $sec_prefix;
- if (!$five) $prefix = strtolower($prefix);
- $class = str_replace($prefix, '', get_class($obj));
- $lclass = strtolower($class);
- $class .= '(';
- switch ($lclass) {
- case 'enum':
- $values = array();
- foreach ($obj->valid_values as $value => $bool) {
- $values[] = $value;
- }
- $class .= implode(', ', $values);
- break;
- case 'css_composite':
- $values = array();
- foreach ($obj->defs as $def) {
- $values[] = $this->getClass($def, $sec_prefix);
- }
- $class .= implode(', ', $values);
- break;
- case 'css_multiple':
- $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
- $class .= $obj->max;
- break;
- case 'css_denyelementdecorator':
- $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
- $class .= $obj->element;
- break;
- case 'css_importantdecorator':
- $class .= $this->getClass($obj->def, $sec_prefix);
- if ($obj->allow) $class .= ', !important';
- break;
- }
- $class .= ')';
- return $class;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php b/extlib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
deleted file mode 100644
index 81f986590..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
-{
-
- protected $def;
-
- public function render($config) {
- $this->def = $config->getCSSDefinition();
- $ret = '';
-
- $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
- $ret .= $this->start('table');
-
- $ret .= $this->element('caption', 'Properties ($info)');
-
- $ret .= $this->start('thead');
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
- $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
- $ret .= $this->end('tr');
- $ret .= $this->end('thead');
-
- ksort($this->def->info);
- foreach ($this->def->info as $property => $obj) {
- $name = $this->getClass($obj, 'AttrDef_');
- $ret .= $this->row($property, $name);
- }
-
- $ret .= $this->end('table');
- $ret .= $this->end('div');
-
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css b/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
deleted file mode 100644
index 3ff1a88aa..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.hp-config {}
-
-.hp-config tbody th {text-align:right; padding-right:0.5em;}
-.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
-.hp-config .namespace th {text-align:center;}
-.hp-config .verbose {display:none;}
-.hp-config .controls {text-align:center;}
-
-/* vim: et sw=4 sts=4 */
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js b/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
deleted file mode 100644
index cba00c9b8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function toggleWriteability(id_of_patient, checked) {
- document.getElementById(id_of_patient).disabled = checked;
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php b/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
deleted file mode 100644
index 02aa65689..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-
-/**
- * @todo Rewrite to use Interchange objects
- */
-class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
-{
-
- /**
- * Printers for specific fields
- */
- protected $fields = array();
-
- /**
- * Documentation URL, can have fragment tagged on end
- */
- protected $docURL;
-
- /**
- * Name of form element to stuff config in
- */
- protected $name;
-
- /**
- * Whether or not to compress directive names, clipping them off
- * after a certain amount of letters. False to disable or integer letters
- * before clipping.
- */
- protected $compress = false;
-
- /**
- * @param $name Form element name for directives to be stuffed into
- * @param $doc_url String documentation URL, will have fragment tagged on
- * @param $compress Integer max length before compressing a directive name, set to false to turn off
- */
- public function __construct(
- $name, $doc_url = null, $compress = false
- ) {
- parent::__construct();
- $this->docURL = $doc_url;
- $this->name = $name;
- $this->compress = $compress;
- // initialize sub-printers
- $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
- $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
- }
-
- /**
- * Sets default column and row size for textareas in sub-printers
- * @param $cols Integer columns of textarea, null to use default
- * @param $rows Integer rows of textarea, null to use default
- */
- public function setTextareaDimensions($cols = null, $rows = null) {
- if ($cols) $this->fields['default']->cols = $cols;
- if ($rows) $this->fields['default']->rows = $rows;
- }
-
- /**
- * Retrieves styling, in case it is not accessible by webserver
- */
- public static function getCSS() {
- return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
- }
-
- /**
- * Retrieves JavaScript, in case it is not accessible by webserver
- */
- public static function getJavaScript() {
- return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
- }
-
- /**
- * Returns HTML output for a configuration form
- * @param $config Configuration object of current form state, or an array
- * where [0] has an HTML namespace and [1] is being rendered.
- * @param $allowed Optional namespace(s) and directives to restrict form to.
- */
- public function render($config, $allowed = true, $render_controls = true) {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
-
- $this->config = $config;
- $this->genConfig = $gen_config;
- $this->prepareGenerator($gen_config);
-
- $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
- $all = array();
- foreach ($allowed as $key) {
- list($ns, $directive) = $key;
- $all[$ns][$directive] = $config->get($ns .'.'. $directive);
- }
-
- $ret = '';
- $ret .= $this->start('table', array('class' => 'hp-config'));
- $ret .= $this->start('thead');
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
- $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
- $ret .= $this->end('tr');
- $ret .= $this->end('thead');
- foreach ($all as $ns => $directives) {
- $ret .= $this->renderNamespace($ns, $directives);
- }
- if ($render_controls) {
- $ret .= $this->start('tbody');
- $ret .= $this->start('tr');
- $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
- $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
- $ret .= '[<a href="?">Reset</a>]';
- $ret .= $this->end('td');
- $ret .= $this->end('tr');
- $ret .= $this->end('tbody');
- }
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders a single namespace
- * @param $ns String namespace name
- * @param $directive Associative array of directives to values
- */
- protected function renderNamespace($ns, $directives) {
- $ret = '';
- $ret .= $this->start('tbody', array('class' => 'namespace'));
- $ret .= $this->start('tr');
- $ret .= $this->element('th', $ns, array('colspan' => 2));
- $ret .= $this->end('tr');
- $ret .= $this->end('tbody');
- $ret .= $this->start('tbody');
- foreach ($directives as $directive => $value) {
- $ret .= $this->start('tr');
- $ret .= $this->start('th');
- if ($this->docURL) {
- $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
- $ret .= $this->start('a', array('href' => $url));
- }
- $attr = array('for' => "{$this->name}:$ns.$directive");
-
- // crop directive name if it's too long
- if (!$this->compress || (strlen($directive) < $this->compress)) {
- $directive_disp = $directive;
- } else {
- $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
- $attr['title'] = $directive;
- }
-
- $ret .= $this->element(
- 'label',
- $directive_disp,
- // component printers must create an element with this id
- $attr
- );
- if ($this->docURL) $ret .= $this->end('a');
- $ret .= $this->end('th');
-
- $ret .= $this->start('td');
- $def = $this->config->def->info["$ns.$directive"];
- if (is_int($def)) {
- $allow_null = $def < 0;
- $type = abs($def);
- } else {
- $type = $def->type;
- $allow_null = isset($def->allow_null);
- }
- if (!isset($this->fields[$type])) $type = 0; // default
- $type_obj = $this->fields[$type];
- if ($allow_null) {
- $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
- }
- $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
- $ret .= $this->end('td');
- $ret .= $this->end('tr');
- }
- $ret .= $this->end('tbody');
- return $ret;
- }
-
-}
-
-/**
- * Printer decorator for directives that accept null
- */
-class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer {
- /**
- * Printer being decorated
- */
- protected $obj;
- /**
- * @param $obj Printer to decorate
- */
- public function __construct($obj) {
- parent::__construct();
- $this->obj = $obj;
- }
- public function render($ns, $directive, $value, $name, $config) {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
- $this->prepareGenerator($gen_config);
-
- $ret = '';
- $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
- $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
- $ret .= $this->text(' Null/Disabled');
- $ret .= $this->end('label');
- $attr = array(
- 'type' => 'checkbox',
- 'value' => '1',
- 'class' => 'null-toggle',
- 'name' => "$name"."[Null_$ns.$directive]",
- 'id' => "$name:Null_$ns.$directive",
- 'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
- );
- if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
- // modify inline javascript slightly
- $attr['onclick'] = "toggleWriteability('$name:Yes_$ns.$directive',checked);toggleWriteability('$name:No_$ns.$directive',checked)";
- }
- if ($value === null) $attr['checked'] = 'checked';
- $ret .= $this->elementEmpty('input', $attr);
- $ret .= $this->text(' or ');
- $ret .= $this->elementEmpty('br');
- $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
- return $ret;
- }
-}
-
-/**
- * Swiss-army knife configuration form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
- public $cols = 18;
- public $rows = 5;
- public function render($ns, $directive, $value, $name, $config) {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
- $this->prepareGenerator($gen_config);
- // this should probably be split up a little
- $ret = '';
- $def = $config->def->info["$ns.$directive"];
- if (is_int($def)) {
- $type = abs($def);
- } else {
- $type = $def->type;
- }
- if (is_array($value)) {
- switch ($type) {
- case HTMLPurifier_VarParser::LOOKUP:
- $array = $value;
- $value = array();
- foreach ($array as $val => $b) {
- $value[] = $val;
- }
- case HTMLPurifier_VarParser::ALIST:
- $value = implode(PHP_EOL, $value);
- break;
- case HTMLPurifier_VarParser::HASH:
- $nvalue = '';
- foreach ($value as $i => $v) {
- $nvalue .= "$i:$v" . PHP_EOL;
- }
- $value = $nvalue;
- break;
- default:
- $value = '';
- }
- }
- if ($type === HTMLPurifier_VarParser::MIXED) {
- return 'Not supported';
- $value = serialize($value);
- }
- $attr = array(
- 'name' => "$name"."[$ns.$directive]",
- 'id' => "$name:$ns.$directive"
- );
- if ($value === null) $attr['disabled'] = 'disabled';
- if (isset($def->allowed)) {
- $ret .= $this->start('select', $attr);
- foreach ($def->allowed as $val => $b) {
- $attr = array();
- if ($value == $val) $attr['selected'] = 'selected';
- $ret .= $this->element('option', $val, $attr);
- }
- $ret .= $this->end('select');
- } elseif (
- $type === HTMLPurifier_VarParser::TEXT ||
- $type === HTMLPurifier_VarParser::ITEXT ||
- $type === HTMLPurifier_VarParser::ALIST ||
- $type === HTMLPurifier_VarParser::HASH ||
- $type === HTMLPurifier_VarParser::LOOKUP
- ) {
- $attr['cols'] = $this->cols;
- $attr['rows'] = $this->rows;
- $ret .= $this->start('textarea', $attr);
- $ret .= $this->text($value);
- $ret .= $this->end('textarea');
- } else {
- $attr['value'] = $value;
- $attr['type'] = 'text';
- $ret .= $this->elementEmpty('input', $attr);
- }
- return $ret;
- }
-}
-
-/**
- * Bool form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
- public function render($ns, $directive, $value, $name, $config) {
- if (is_array($config) && isset($config[0])) {
- $gen_config = $config[0];
- $config = $config[1];
- } else {
- $gen_config = $config;
- }
- $this->prepareGenerator($gen_config);
- $ret = '';
- $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
-
- $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
- $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
- $ret .= $this->text(' Yes');
- $ret .= $this->end('label');
-
- $attr = array(
- 'type' => 'radio',
- 'name' => "$name"."[$ns.$directive]",
- 'id' => "$name:Yes_$ns.$directive",
- 'value' => '1'
- );
- if ($value === true) $attr['checked'] = 'checked';
- if ($value === null) $attr['disabled'] = 'disabled';
- $ret .= $this->elementEmpty('input', $attr);
-
- $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
- $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
- $ret .= $this->text(' No');
- $ret .= $this->end('label');
-
- $attr = array(
- 'type' => 'radio',
- 'name' => "$name"."[$ns.$directive]",
- 'id' => "$name:No_$ns.$directive",
- 'value' => '0'
- );
- if ($value === false) $attr['checked'] = 'checked';
- if ($value === null) $attr['disabled'] = 'disabled';
- $ret .= $this->elementEmpty('input', $attr);
-
- $ret .= $this->end('div');
-
- return $ret;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php b/extlib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
deleted file mode 100644
index 8a8f126b8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
-{
-
- /**
- * Instance of HTMLPurifier_HTMLDefinition, for easy access
- */
- protected $def;
-
- public function render($config) {
- $ret = '';
- $this->config =& $config;
-
- $this->def = $config->getHTMLDefinition();
-
- $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-
- $ret .= $this->renderDoctype();
- $ret .= $this->renderEnvironment();
- $ret .= $this->renderContentSets();
- $ret .= $this->renderInfo();
-
- $ret .= $this->end('div');
-
- return $ret;
- }
-
- /**
- * Renders the Doctype table
- */
- protected function renderDoctype() {
- $doctype = $this->def->doctype;
- $ret = '';
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Doctype');
- $ret .= $this->row('Name', $doctype->name);
- $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
- $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
- $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
- $ret .= $this->end('table');
- return $ret;
- }
-
-
- /**
- * Renders environment table, which is miscellaneous info
- */
- protected function renderEnvironment() {
- $def = $this->def;
-
- $ret = '';
-
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Environment');
-
- $ret .= $this->row('Parent of fragment', $def->info_parent);
- $ret .= $this->renderChildren($def->info_parent_def->child);
- $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Global attributes');
- $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr),0,0);
- $ret .= $this->end('tr');
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Tag transforms');
- $list = array();
- foreach ($def->info_tag_transform as $old => $new) {
- $new = $this->getClass($new, 'TagTransform_');
- $list[] = "<$old> with $new";
- }
- $ret .= $this->element('td', $this->listify($list));
- $ret .= $this->end('tr');
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Pre-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
- $ret .= $this->end('tr');
-
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Post-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
- $ret .= $this->end('tr');
-
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders the Content Sets table
- */
- protected function renderContentSets() {
- $ret = '';
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Content Sets');
- foreach ($this->def->info_content_sets as $name => $lookup) {
- $ret .= $this->heavyHeader($name);
- $ret .= $this->start('tr');
- $ret .= $this->element('td', $this->listifyTagLookup($lookup));
- $ret .= $this->end('tr');
- }
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders the Elements ($info) table
- */
- protected function renderInfo() {
- $ret = '';
- $ret .= $this->start('table');
- $ret .= $this->element('caption', 'Elements ($info)');
- ksort($this->def->info);
- $ret .= $this->heavyHeader('Allowed tags', 2);
- $ret .= $this->start('tr');
- $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
- $ret .= $this->end('tr');
- foreach ($this->def->info as $name => $def) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', "<$name>", array('class'=>'heavy', 'colspan' => 2));
- $ret .= $this->end('tr');
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Inline content');
- $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
- $ret .= $this->end('tr');
- if (!empty($def->excludes)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Excludes');
- $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
- $ret .= $this->end('tr');
- }
- if (!empty($def->attr_transform_pre)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Pre-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
- $ret .= $this->end('tr');
- }
- if (!empty($def->attr_transform_post)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Post-AttrTransform');
- $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
- $ret .= $this->end('tr');
- }
- if (!empty($def->auto_close)) {
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Auto closed by');
- $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
- $ret .= $this->end('tr');
- }
- $ret .= $this->start('tr');
- $ret .= $this->element('th', 'Allowed attributes');
- $ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
- $ret .= $this->end('tr');
-
- if (!empty($def->required_attr)) {
- $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
- }
-
- $ret .= $this->renderChildren($def->child);
- }
- $ret .= $this->end('table');
- return $ret;
- }
-
- /**
- * Renders a row describing the allowed children of an element
- * @param $def HTMLPurifier_ChildDef of pertinent element
- */
- protected function renderChildren($def) {
- $context = new HTMLPurifier_Context();
- $ret = '';
- $ret .= $this->start('tr');
- $elements = array();
- $attr = array();
- if (isset($def->elements)) {
- if ($def->type == 'strictblockquote') {
- $def->validateChildren(array(), $this->config, $context);
- }
- $elements = $def->elements;
- }
- if ($def->type == 'chameleon') {
- $attr['rowspan'] = 2;
- } elseif ($def->type == 'empty') {
- $elements = array();
- } elseif ($def->type == 'table') {
- $elements = array_flip(array('col', 'caption', 'colgroup', 'thead',
- 'tfoot', 'tbody', 'tr'));
- }
- $ret .= $this->element('th', 'Allowed children', $attr);
-
- if ($def->type == 'chameleon') {
-
- $ret .= $this->element('td',
- '<em>Block</em>: ' .
- $this->escape($this->listifyTagLookup($def->block->elements)),0,0);
- $ret .= $this->end('tr');
- $ret .= $this->start('tr');
- $ret .= $this->element('td',
- '<em>Inline</em>: ' .
- $this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
-
- } elseif ($def->type == 'custom') {
-
- $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
- $def->dtd_regex);
-
- } else {
- $ret .= $this->element('td',
- '<em>'.ucfirst($def->type).'</em>: ' .
- $this->escape($this->listifyTagLookup($elements)),0,0);
- }
- $ret .= $this->end('tr');
- return $ret;
- }
-
- /**
- * Listifies a tag lookup table.
- * @param $array Tag lookup array in form of array('tagname' => true)
- */
- protected function listifyTagLookup($array) {
- ksort($array);
- $list = array();
- foreach ($array as $name => $discard) {
- if ($name !== '#PCDATA' && !isset($this->def->info[$name])) continue;
- $list[] = $name;
- }
- return $this->listify($list);
- }
-
- /**
- * Listifies a list of objects by retrieving class names and internal state
- * @param $array List of objects
- * @todo Also add information about internal state
- */
- protected function listifyObjectList($array) {
- ksort($array);
- $list = array();
- foreach ($array as $discard => $obj) {
- $list[] = $this->getClass($obj, 'AttrTransform_');
- }
- return $this->listify($list);
- }
-
- /**
- * Listifies a hash of attributes to AttrDef classes
- * @param $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
- */
- protected function listifyAttr($array) {
- ksort($array);
- $list = array();
- foreach ($array as $name => $obj) {
- if ($obj === false) continue;
- $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
- }
- return $this->listify($list);
- }
-
- /**
- * Creates a heavy header row
- */
- protected function heavyHeader($text, $num = 1) {
- $ret = '';
- $ret .= $this->start('tr');
- $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
- $ret .= $this->end('tr');
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/PropertyList.php b/extlib/HTMLPurifier/HTMLPurifier/PropertyList.php
deleted file mode 100644
index 2b99fb7bc..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/PropertyList.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Generic property list implementation
- */
-class HTMLPurifier_PropertyList
-{
- /**
- * Internal data-structure for properties
- */
- protected $data = array();
-
- /**
- * Parent plist
- */
- protected $parent;
-
- protected $cache;
-
- public function __construct($parent = null) {
- $this->parent = $parent;
- }
-
- /**
- * Recursively retrieves the value for a key
- */
- public function get($name) {
- if ($this->has($name)) return $this->data[$name];
- // possible performance bottleneck, convert to iterative if necessary
- if ($this->parent) return $this->parent->get($name);
- throw new HTMLPurifier_Exception("Key '$name' not found");
- }
-
- /**
- * Sets the value of a key, for this plist
- */
- public function set($name, $value) {
- $this->data[$name] = $value;
- }
-
- /**
- * Returns true if a given key exists
- */
- public function has($name) {
- return array_key_exists($name, $this->data);
- }
-
- /**
- * Resets a value to the value of it's parent, usually the default. If
- * no value is specified, the entire plist is reset.
- */
- public function reset($name = null) {
- if ($name == null) $this->data = array();
- else unset($this->data[$name]);
- }
-
- /**
- * Squashes this property list and all of its property lists into a single
- * array, and returns the array. This value is cached by default.
- * @param $force If true, ignores the cache and regenerates the array.
- */
- public function squash($force = false) {
- if ($this->cache !== null && !$force) return $this->cache;
- if ($this->parent) {
- return $this->cache = array_merge($this->parent->squash($force), $this->data);
- } else {
- return $this->cache = $this->data;
- }
- }
-
- /**
- * Returns the parent plist.
- */
- public function getParent() {
- return $this->parent;
- }
-
- /**
- * Sets the parent plist.
- */
- public function setParent($plist) {
- $this->parent = $plist;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php b/extlib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
deleted file mode 100644
index 8f250443e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Property list iterator. Do not instantiate this class directly.
- */
-class HTMLPurifier_PropertyListIterator extends FilterIterator
-{
-
- protected $l;
- protected $filter;
-
- /**
- * @param $data Array of data to iterate over
- * @param $filter Optional prefix to only allow values of
- */
- public function __construct(Iterator $iterator, $filter = null) {
- parent::__construct($iterator);
- $this->l = strlen($filter);
- $this->filter = $filter;
- }
-
- public function accept() {
- $key = $this->getInnerIterator()->key();
- if( strncmp($key, $this->filter, $this->l) !== 0 ) {
- return false;
- }
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy.php
deleted file mode 100644
index 246286521..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Supertype for classes that define a strategy for modifying/purifying tokens.
- *
- * While HTMLPurifier's core purpose is fixing HTML into something proper,
- * strategies provide plug points for extra configuration or even extra
- * features, such as custom tags, custom parsing of text, etc.
- */
-
-
-abstract class HTMLPurifier_Strategy
-{
-
- /**
- * Executes the strategy on the tokens.
- *
- * @param $tokens Array of HTMLPurifier_Token objects to be operated on.
- * @param $config Configuration options
- * @returns Processed array of token objects.
- */
- abstract public function execute($tokens, $config, $context);
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
deleted file mode 100644
index 816490b79..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Composite strategy that runs multiple strategies on tokens.
- */
-abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
-{
-
- /**
- * List of strategies to run tokens through.
- */
- protected $strategies = array();
-
- abstract public function __construct();
-
- public function execute($tokens, $config, $context) {
- foreach ($this->strategies as $strategy) {
- $tokens = $strategy->execute($tokens, $config, $context);
- }
- return $tokens;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy/Core.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy/Core.php
deleted file mode 100644
index d90e15860..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy/Core.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Core strategy composed of the big four strategies.
- */
-class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
-{
-
- public function __construct() {
- $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
- $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
- $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
- $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
deleted file mode 100644
index f81802391..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-/**
- * Takes a well formed list of tokens and fixes their nesting.
- *
- * HTML elements dictate which elements are allowed to be their children,
- * for example, you can't have a p tag in a span tag. Other elements have
- * much more rigorous definitions: tables, for instance, require a specific
- * order for their elements. There are also constraints not expressible by
- * document type definitions, such as the chameleon nature of ins/del
- * tags and global child exclusions.
- *
- * The first major objective of this strategy is to iterate through all the
- * nodes (not tokens) of the list of tokens and determine whether or not
- * their children conform to the element's definition. If they do not, the
- * child definition may optionally supply an amended list of elements that
- * is valid or require that the entire node be deleted (and the previous
- * node rescanned).
- *
- * The second objective is to ensure that explicitly excluded elements of
- * an element do not appear in its children. Code that accomplishes this
- * task is pervasive through the strategy, though the two are distinct tasks
- * and could, theoretically, be seperated (although it's not recommended).
- *
- * @note Whether or not unrecognized children are silently dropped or
- * translated into text depends on the child definitions.
- *
- * @todo Enable nodes to be bubbled out of the structure.
- */
-
-class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
-{
-
- public function execute($tokens, $config, $context) {
- //####################################################################//
- // Pre-processing
-
- // get a copy of the HTML definition
- $definition = $config->getHTMLDefinition();
-
- // insert implicit "parent" node, will be removed at end.
- // DEFINITION CALL
- $parent_name = $definition->info_parent;
- array_unshift($tokens, new HTMLPurifier_Token_Start($parent_name));
- $tokens[] = new HTMLPurifier_Token_End($parent_name);
-
- // setup the context variable 'IsInline', for chameleon processing
- // is 'false' when we are not inline, 'true' when it must always
- // be inline, and an integer when it is inline for a certain
- // branch of the document tree
- $is_inline = $definition->info_parent_def->descendants_are_inline;
- $context->register('IsInline', $is_inline);
-
- // setup error collector
- $e =& $context->get('ErrorCollector', true);
-
- //####################################################################//
- // Loop initialization
-
- // stack that contains the indexes of all parents,
- // $stack[count($stack)-1] being the current parent
- $stack = array();
-
- // stack that contains all elements that are excluded
- // it is organized by parent elements, similar to $stack,
- // but it is only populated when an element with exclusions is
- // processed, i.e. there won't be empty exclusions.
- $exclude_stack = array();
-
- // variable that contains the start token while we are processing
- // nodes. This enables error reporting to do its job
- $start_token = false;
- $context->register('CurrentToken', $start_token);
-
- //####################################################################//
- // Loop
-
- // iterate through all start nodes. Determining the start node
- // is complicated so it has been omitted from the loop construct
- for ($i = 0, $size = count($tokens) ; $i < $size; ) {
-
- //################################################################//
- // Gather information on children
-
- // child token accumulator
- $child_tokens = array();
-
- // scroll to the end of this node, report number, and collect
- // all children
- for ($j = $i, $depth = 0; ; $j++) {
- if ($tokens[$j] instanceof HTMLPurifier_Token_Start) {
- $depth++;
- // skip token assignment on first iteration, this is the
- // token we currently are on
- if ($depth == 1) continue;
- } elseif ($tokens[$j] instanceof HTMLPurifier_Token_End) {
- $depth--;
- // skip token assignment on last iteration, this is the
- // end token of the token we're currently on
- if ($depth == 0) break;
- }
- $child_tokens[] = $tokens[$j];
- }
-
- // $i is index of start token
- // $j is index of end token
-
- $start_token = $tokens[$i]; // to make token available via CurrentToken
-
- //################################################################//
- // Gather information on parent
-
- // calculate parent information
- if ($count = count($stack)) {
- $parent_index = $stack[$count-1];
- $parent_name = $tokens[$parent_index]->name;
- if ($parent_index == 0) {
- $parent_def = $definition->info_parent_def;
- } else {
- $parent_def = $definition->info[$parent_name];
- }
- } else {
- // processing as if the parent were the "root" node
- // unknown info, it won't be used anyway, in the future,
- // we may want to enforce one element only (this is
- // necessary for HTML Purifier to clean entire documents
- $parent_index = $parent_name = $parent_def = null;
- }
-
- // calculate context
- if ($is_inline === false) {
- // check if conditions make it inline
- if (!empty($parent_def) && $parent_def->descendants_are_inline) {
- $is_inline = $count - 1;
- }
- } else {
- // check if we're out of inline
- if ($count === $is_inline) {
- $is_inline = false;
- }
- }
-
- //################################################################//
- // Determine whether element is explicitly excluded SGML-style
-
- // determine whether or not element is excluded by checking all
- // parent exclusions. The array should not be very large, two
- // elements at most.
- $excluded = false;
- if (!empty($exclude_stack)) {
- foreach ($exclude_stack as $lookup) {
- if (isset($lookup[$tokens[$i]->name])) {
- $excluded = true;
- // no need to continue processing
- break;
- }
- }
- }
-
- //################################################################//
- // Perform child validation
-
- if ($excluded) {
- // there is an exclusion, remove the entire node
- $result = false;
- $excludes = array(); // not used, but good to initialize anyway
- } else {
- // DEFINITION CALL
- if ($i === 0) {
- // special processing for the first node
- $def = $definition->info_parent_def;
- } else {
- $def = $definition->info[$tokens[$i]->name];
-
- }
-
- if (!empty($def->child)) {
- // have DTD child def validate children
- $result = $def->child->validateChildren(
- $child_tokens, $config, $context);
- } else {
- // weird, no child definition, get rid of everything
- $result = false;
- }
-
- // determine whether or not this element has any exclusions
- $excludes = $def->excludes;
- }
-
- // $result is now a bool or array
-
- //################################################################//
- // Process result by interpreting $result
-
- if ($result === true || $child_tokens === $result) {
- // leave the node as is
-
- // register start token as a parental node start
- $stack[] = $i;
-
- // register exclusions if there are any
- if (!empty($excludes)) $exclude_stack[] = $excludes;
-
- // move cursor to next possible start node
- $i++;
-
- } elseif($result === false) {
- // remove entire node
-
- if ($e) {
- if ($excluded) {
- $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
- } else {
- $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
- }
- }
-
- // calculate length of inner tokens and current tokens
- $length = $j - $i + 1;
-
- // perform removal
- array_splice($tokens, $i, $length);
-
- // update size
- $size -= $length;
-
- // there is no start token to register,
- // current node is now the next possible start node
- // unless it turns out that we need to do a double-check
-
- // this is a rought heuristic that covers 100% of HTML's
- // cases and 99% of all other cases. A child definition
- // that would be tricked by this would be something like:
- // ( | a b c) where it's all or nothing. Fortunately,
- // our current implementation claims that that case would
- // not allow empty, even if it did
- if (!$parent_def->child->allow_empty) {
- // we need to do a double-check
- $i = $parent_index;
- array_pop($stack);
- }
-
- // PROJECTED OPTIMIZATION: Process all children elements before
- // reprocessing parent node.
-
- } else {
- // replace node with $result
-
- // calculate length of inner tokens
- $length = $j - $i - 1;
-
- if ($e) {
- if (empty($result) && $length) {
- $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
- } else {
- $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
- }
- }
-
- // perform replacement
- array_splice($tokens, $i + 1, $length, $result);
-
- // update size
- $size -= $length;
- $size += count($result);
-
- // register start token as a parental node start
- $stack[] = $i;
-
- // register exclusions if there are any
- if (!empty($excludes)) $exclude_stack[] = $excludes;
-
- // move cursor to next possible start node
- $i++;
-
- }
-
- //################################################################//
- // Scroll to next start node
-
- // We assume, at this point, that $i is the index of the token
- // that is the first possible new start point for a node.
-
- // Test if the token indeed is a start tag, if not, move forward
- // and test again.
- $size = count($tokens);
- while ($i < $size and !$tokens[$i] instanceof HTMLPurifier_Token_Start) {
- if ($tokens[$i] instanceof HTMLPurifier_Token_End) {
- // pop a token index off the stack if we ended a node
- array_pop($stack);
- // pop an exclusion lookup off exclusion stack if
- // we ended node and that node had exclusions
- if ($i == 0 || $i == $size - 1) {
- // use specialized var if it's the super-parent
- $s_excludes = $definition->info_parent_def->excludes;
- } else {
- $s_excludes = $definition->info[$tokens[$i]->name]->excludes;
- }
- if ($s_excludes) {
- array_pop($exclude_stack);
- }
- }
- $i++;
- }
-
- }
-
- //####################################################################//
- // Post-processing
-
- // remove implicit parent tokens at the beginning and end
- array_shift($tokens);
- array_pop($tokens);
-
- // remove context variables
- $context->destroy('IsInline');
- $context->destroy('CurrentToken');
-
- //####################################################################//
- // Return
-
- return $tokens;
-
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
deleted file mode 100644
index feb0c32b4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
+++ /dev/null
@@ -1,457 +0,0 @@
-<?php
-
-/**
- * Takes tokens makes them well-formed (balance end tags, etc.)
- */
-class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
-{
-
- /**
- * Array stream of tokens being processed.
- */
- protected $tokens;
-
- /**
- * Current index in $tokens.
- */
- protected $t;
-
- /**
- * Current nesting of elements.
- */
- protected $stack;
-
- /**
- * Injectors active in this stream processing.
- */
- protected $injectors;
-
- /**
- * Current instance of HTMLPurifier_Config.
- */
- protected $config;
-
- /**
- * Current instance of HTMLPurifier_Context.
- */
- protected $context;
-
- public function execute($tokens, $config, $context) {
-
- $definition = $config->getHTMLDefinition();
-
- // local variables
- $generator = new HTMLPurifier_Generator($config, $context);
- $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
- $e = $context->get('ErrorCollector', true);
- $t = false; // token index
- $i = false; // injector index
- $token = false; // the current token
- $reprocess = false; // whether or not to reprocess the same token
- $stack = array();
-
- // member variables
- $this->stack =& $stack;
- $this->t =& $t;
- $this->tokens =& $tokens;
- $this->config = $config;
- $this->context = $context;
-
- // context variables
- $context->register('CurrentNesting', $stack);
- $context->register('InputIndex', $t);
- $context->register('InputTokens', $tokens);
- $context->register('CurrentToken', $token);
-
- // -- begin INJECTOR --
-
- $this->injectors = array();
-
- $injectors = $config->getBatch('AutoFormat');
- $def_injectors = $definition->info_injector;
- $custom_injectors = $injectors['Custom'];
- unset($injectors['Custom']); // special case
- foreach ($injectors as $injector => $b) {
- // XXX: Fix with a legitimate lookup table of enabled filters
- if (strpos($injector, '.') !== false) continue;
- $injector = "HTMLPurifier_Injector_$injector";
- if (!$b) continue;
- $this->injectors[] = new $injector;
- }
- foreach ($def_injectors as $injector) {
- // assumed to be objects
- $this->injectors[] = $injector;
- }
- foreach ($custom_injectors as $injector) {
- if (is_string($injector)) {
- $injector = "HTMLPurifier_Injector_$injector";
- $injector = new $injector;
- }
- $this->injectors[] = $injector;
- }
-
- // give the injectors references to the definition and context
- // variables for performance reasons
- foreach ($this->injectors as $ix => $injector) {
- $error = $injector->prepare($config, $context);
- if (!$error) continue;
- array_splice($this->injectors, $ix, 1); // rm the injector
- trigger_error("Cannot enable {$injector->name} injector because $error is not allowed", E_USER_WARNING);
- }
-
- // -- end INJECTOR --
-
- // a note on punting:
- // In order to reduce code duplication, whenever some code needs
- // to make HTML changes in order to make things "correct", the
- // new HTML gets sent through the purifier, regardless of its
- // status. This means that if we add a start token, because it
- // was totally necessary, we don't have to update nesting; we just
- // punt ($reprocess = true; continue;) and it does that for us.
-
- // isset is in loop because $tokens size changes during loop exec
- for (
- $t = 0;
- $t == 0 || isset($tokens[$t - 1]);
- // only increment if we don't need to reprocess
- $reprocess ? $reprocess = false : $t++
- ) {
-
- // check for a rewind
- if (is_int($i) && $i >= 0) {
- // possibility: disable rewinding if the current token has a
- // rewind set on it already. This would offer protection from
- // infinite loop, but might hinder some advanced rewinding.
- $rewind_to = $this->injectors[$i]->getRewind();
- if (is_int($rewind_to) && $rewind_to < $t) {
- if ($rewind_to < 0) $rewind_to = 0;
- while ($t > $rewind_to) {
- $t--;
- $prev = $tokens[$t];
- // indicate that other injectors should not process this token,
- // but we need to reprocess it
- unset($prev->skip[$i]);
- $prev->rewind = $i;
- if ($prev instanceof HTMLPurifier_Token_Start) array_pop($this->stack);
- elseif ($prev instanceof HTMLPurifier_Token_End) $this->stack[] = $prev->start;
- }
- }
- $i = false;
- }
-
- // handle case of document end
- if (!isset($tokens[$t])) {
- // kill processing if stack is empty
- if (empty($this->stack)) break;
-
- // peek
- $top_nesting = array_pop($this->stack);
- $this->stack[] = $top_nesting;
-
- // send error
- if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
- }
-
- // append, don't splice, since this is the end
- $tokens[] = new HTMLPurifier_Token_End($top_nesting->name);
-
- // punt!
- $reprocess = true;
- continue;
- }
-
- $token = $tokens[$t];
-
- //echo '<br>'; printTokens($tokens, $t); printTokens($this->stack);
-
- // quick-check: if it's not a tag, no need to process
- if (empty($token->is_tag)) {
- if ($token instanceof HTMLPurifier_Token_Text) {
- foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) continue;
- if ($token->rewind !== null && $token->rewind !== $i) continue;
- $injector->handleText($token);
- $this->processToken($token, $i);
- $reprocess = true;
- break;
- }
- }
- // another possibility is a comment
- continue;
- }
-
- if (isset($definition->info[$token->name])) {
- $type = $definition->info[$token->name]->child->type;
- } else {
- $type = false; // Type is unknown, treat accordingly
- }
-
- // quick tag checks: anything that's *not* an end tag
- $ok = false;
- if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) {
- // claims to be a start tag but is empty
- $token = new HTMLPurifier_Token_Empty($token->name, $token->attr);
- $ok = true;
- } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) {
- // claims to be empty but really is a start tag
- $this->swap(new HTMLPurifier_Token_End($token->name));
- $this->insertBefore(new HTMLPurifier_Token_Start($token->name, $token->attr));
- // punt (since we had to modify the input stream in a non-trivial way)
- $reprocess = true;
- continue;
- } elseif ($token instanceof HTMLPurifier_Token_Empty) {
- // real empty token
- $ok = true;
- } elseif ($token instanceof HTMLPurifier_Token_Start) {
- // start tag
-
- // ...unless they also have to close their parent
- if (!empty($this->stack)) {
-
- $parent = array_pop($this->stack);
- $this->stack[] = $parent;
-
- if (isset($definition->info[$parent->name])) {
- $elements = $definition->info[$parent->name]->child->getAllowedElements($config);
- $autoclose = !isset($elements[$token->name]);
- } else {
- $autoclose = false;
- }
-
- $carryover = false;
- if ($autoclose && $definition->info[$parent->name]->formatting) {
- $carryover = true;
- }
-
- if ($autoclose) {
- // errors need to be updated
- $new_token = new HTMLPurifier_Token_End($parent->name);
- $new_token->start = $parent;
- if ($carryover) {
- $element = clone $parent;
- $element->armor['MakeWellFormed_TagClosedError'] = true;
- $element->carryover = true;
- $this->processToken(array($new_token, $token, $element));
- } else {
- $this->insertBefore($new_token);
- }
- if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
- if (!$carryover) {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
- } else {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
- }
- }
- $reprocess = true;
- continue;
- }
-
- }
- $ok = true;
- }
-
- if ($ok) {
- foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) continue;
- if ($token->rewind !== null && $token->rewind !== $i) continue;
- $injector->handleElement($token);
- $this->processToken($token, $i);
- $reprocess = true;
- break;
- }
- if (!$reprocess) {
- // ah, nothing interesting happened; do normal processing
- $this->swap($token);
- if ($token instanceof HTMLPurifier_Token_Start) {
- $this->stack[] = $token;
- } elseif ($token instanceof HTMLPurifier_Token_End) {
- throw new HTMLPurifier_Exception('Improper handling of end tag in start code; possible error in MakeWellFormed');
- }
- }
- continue;
- }
-
- // sanity check: we should be dealing with a closing tag
- if (!$token instanceof HTMLPurifier_Token_End) {
- throw new HTMLPurifier_Exception('Unaccounted for tag token in input stream, bug in HTML Purifier');
- }
-
- // make sure that we have something open
- if (empty($this->stack)) {
- if ($escape_invalid_tags) {
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
- $this->swap(new HTMLPurifier_Token_Text(
- $generator->generateFromToken($token)
- ));
- } else {
- $this->remove();
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
- }
- $reprocess = true;
- continue;
- }
-
- // first, check for the simplest case: everything closes neatly.
- // Eventually, everything passes through here; if there are problems
- // we modify the input stream accordingly and then punt, so that
- // the tokens get processed again.
- $current_parent = array_pop($this->stack);
- if ($current_parent->name == $token->name) {
- $token->start = $current_parent;
- foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) continue;
- if ($token->rewind !== null && $token->rewind !== $i) continue;
- $injector->handleEnd($token);
- $this->processToken($token, $i);
- $this->stack[] = $current_parent;
- $reprocess = true;
- break;
- }
- continue;
- }
-
- // okay, so we're trying to close the wrong tag
-
- // undo the pop previous pop
- $this->stack[] = $current_parent;
-
- // scroll back the entire nest, trying to find our tag.
- // (feature could be to specify how far you'd like to go)
- $size = count($this->stack);
- // -2 because -1 is the last element, but we already checked that
- $skipped_tags = false;
- for ($j = $size - 2; $j >= 0; $j--) {
- if ($this->stack[$j]->name == $token->name) {
- $skipped_tags = array_slice($this->stack, $j);
- break;
- }
- }
-
- // we didn't find the tag, so remove
- if ($skipped_tags === false) {
- if ($escape_invalid_tags) {
- $this->swap(new HTMLPurifier_Token_Text(
- $generator->generateFromToken($token)
- ));
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
- } else {
- $this->remove();
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
- }
- $reprocess = true;
- continue;
- }
-
- // do errors, in REVERSE $j order: a,b,c with </a></b></c>
- $c = count($skipped_tags);
- if ($e) {
- for ($j = $c - 1; $j > 0; $j--) {
- // notice we exclude $j == 0, i.e. the current ending tag, from
- // the errors...
- if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
- $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
- }
- }
- }
-
- // insert tags, in FORWARD $j order: c,b,a with </a></b></c>
- $replace = array($token);
- for ($j = 1; $j < $c; $j++) {
- // ...as well as from the insertions
- $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
- $new_token->start = $skipped_tags[$j];
- array_unshift($replace, $new_token);
- if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
- $element = clone $skipped_tags[$j];
- $element->carryover = true;
- $element->armor['MakeWellFormed_TagClosedError'] = true;
- $replace[] = $element;
- }
- }
- $this->processToken($replace);
- $reprocess = true;
- continue;
- }
-
- $context->destroy('CurrentNesting');
- $context->destroy('InputTokens');
- $context->destroy('InputIndex');
- $context->destroy('CurrentToken');
-
- unset($this->injectors, $this->stack, $this->tokens, $this->t);
- return $tokens;
- }
-
- /**
- * Processes arbitrary token values for complicated substitution patterns.
- * In general:
- *
- * If $token is an array, it is a list of tokens to substitute for the
- * current token. These tokens then get individually processed. If there
- * is a leading integer in the list, that integer determines how many
- * tokens from the stream should be removed.
- *
- * If $token is a regular token, it is swapped with the current token.
- *
- * If $token is false, the current token is deleted.
- *
- * If $token is an integer, that number of tokens (with the first token
- * being the current one) will be deleted.
- *
- * @param $token Token substitution value
- * @param $injector Injector that performed the substitution; default is if
- * this is not an injector related operation.
- */
- protected function processToken($token, $injector = -1) {
-
- // normalize forms of token
- if (is_object($token)) $token = array(1, $token);
- if (is_int($token)) $token = array($token);
- if ($token === false) $token = array(1);
- if (!is_array($token)) throw new HTMLPurifier_Exception('Invalid token type from injector');
- if (!is_int($token[0])) array_unshift($token, 1);
- if ($token[0] === 0) throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
-
- // $token is now an array with the following form:
- // array(number nodes to delete, new node 1, new node 2, ...)
-
- $delete = array_shift($token);
- $old = array_splice($this->tokens, $this->t, $delete, $token);
-
- if ($injector > -1) {
- // determine appropriate skips
- $oldskip = isset($old[0]) ? $old[0]->skip : array();
- foreach ($token as $object) {
- $object->skip = $oldskip;
- $object->skip[$injector] = true;
- }
- }
-
- }
-
- /**
- * Inserts a token before the current token. Cursor now points to this token
- */
- private function insertBefore($token) {
- array_splice($this->tokens, $this->t, 0, array($token));
- }
-
- /**
- * Removes current token. Cursor now points to new token occupying previously
- * occupied space.
- */
- private function remove() {
- array_splice($this->tokens, $this->t, 1);
- }
-
- /**
- * Swap current token with new token. Cursor points to new token (no change).
- */
- private function swap($token) {
- $this->tokens[$this->t] = $token;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
deleted file mode 100644
index cf3a33e40..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * Removes all unrecognized tags from the list of tokens.
- *
- * This strategy iterates through all the tokens and removes unrecognized
- * tokens. If a token is not recognized but a TagTransform is defined for
- * that element, the element will be transformed accordingly.
- */
-
-class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
-{
-
- public function execute($tokens, $config, $context) {
- $definition = $config->getHTMLDefinition();
- $generator = new HTMLPurifier_Generator($config, $context);
- $result = array();
-
- $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
- $remove_invalid_img = $config->get('Core.RemoveInvalidImg');
-
- // currently only used to determine if comments should be kept
- $trusted = $config->get('HTML.Trusted');
-
- $remove_script_contents = $config->get('Core.RemoveScriptContents');
- $hidden_elements = $config->get('Core.HiddenElements');
-
- // remove script contents compatibility
- if ($remove_script_contents === true) {
- $hidden_elements['script'] = true;
- } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
- unset($hidden_elements['script']);
- }
-
- $attr_validator = new HTMLPurifier_AttrValidator();
-
- // removes tokens until it reaches a closing tag with its value
- $remove_until = false;
-
- // converts comments into text tokens when this is equal to a tag name
- $textify_comments = false;
-
- $token = false;
- $context->register('CurrentToken', $token);
-
- $e = false;
- if ($config->get('Core.CollectErrors')) {
- $e =& $context->get('ErrorCollector');
- }
-
- foreach($tokens as $token) {
- if ($remove_until) {
- if (empty($token->is_tag) || $token->name !== $remove_until) {
- continue;
- }
- }
- if (!empty( $token->is_tag )) {
- // DEFINITION CALL
-
- // before any processing, try to transform the element
- if (
- isset($definition->info_tag_transform[$token->name])
- ) {
- $original_name = $token->name;
- // there is a transformation for this tag
- // DEFINITION CALL
- $token = $definition->
- info_tag_transform[$token->name]->
- transform($token, $config, $context);
- if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
- }
-
- if (isset($definition->info[$token->name])) {
-
- // mostly everything's good, but
- // we need to make sure required attributes are in order
- if (
- ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
- $definition->info[$token->name]->required_attr &&
- ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
- ) {
- $attr_validator->validateToken($token, $config, $context);
- $ok = true;
- foreach ($definition->info[$token->name]->required_attr as $name) {
- if (!isset($token->attr[$name])) {
- $ok = false;
- break;
- }
- }
- if (!$ok) {
- if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
- continue;
- }
- $token->armor['ValidateAttributes'] = true;
- }
-
- if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
- $textify_comments = $token->name;
- } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
- $textify_comments = false;
- }
-
- } elseif ($escape_invalid_tags) {
- // invalid tag, generate HTML representation and insert in
- if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
- $token = new HTMLPurifier_Token_Text(
- $generator->generateFromToken($token)
- );
- } else {
- // check if we need to destroy all of the tag's children
- // CAN BE GENERICIZED
- if (isset($hidden_elements[$token->name])) {
- if ($token instanceof HTMLPurifier_Token_Start) {
- $remove_until = $token->name;
- } elseif ($token instanceof HTMLPurifier_Token_Empty) {
- // do nothing: we're still looking
- } else {
- $remove_until = false;
- }
- if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
- } else {
- if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
- }
- continue;
- }
- } elseif ($token instanceof HTMLPurifier_Token_Comment) {
- // textify comments in script tags when they are allowed
- if ($textify_comments !== false) {
- $data = $token->data;
- $token = new HTMLPurifier_Token_Text($data);
- } elseif ($trusted) {
- // keep, but perform comment cleaning
- if ($e) {
- // perform check whether or not there's a trailing hyphen
- if (substr($token->data, -1) == '-') {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed');
- }
- }
- $token->data = rtrim($token->data, '-');
- $found_double_hyphen = false;
- while (strpos($token->data, '--') !== false) {
- if ($e && !$found_double_hyphen) {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
- }
- $found_double_hyphen = true; // prevent double-erroring
- $token->data = str_replace('--', '-', $token->data);
- }
- } else {
- // strip comments
- if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
- continue;
- }
- } elseif ($token instanceof HTMLPurifier_Token_Text) {
- } else {
- continue;
- }
- $result[] = $token;
- }
- if ($remove_until && $e) {
- // we removed tokens until the end, throw error
- $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
- }
-
- $context->destroy('CurrentToken');
-
- return $result;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php b/extlib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
deleted file mode 100644
index c3328a9d4..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Validate all attributes in the tokens.
- */
-
-class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
-{
-
- public function execute($tokens, $config, $context) {
-
- // setup validator
- $validator = new HTMLPurifier_AttrValidator();
-
- $token = false;
- $context->register('CurrentToken', $token);
-
- foreach ($tokens as $key => $token) {
-
- // only process tokens that have attributes,
- // namely start and empty tags
- if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
-
- // skip tokens that are armored
- if (!empty($token->armor['ValidateAttributes'])) continue;
-
- // note that we have no facilities here for removing tokens
- $validator->validateToken($token, $config, $context);
-
- $tokens[$key] = $token; // for PHP 4
- }
- $context->destroy('CurrentToken');
-
- return $tokens;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/StringHash.php b/extlib/HTMLPurifier/HTMLPurifier/StringHash.php
deleted file mode 100644
index 62085c5c2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/StringHash.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * This is in almost every respect equivalent to an array except
- * that it keeps track of which keys were accessed.
- *
- * @warning For the sake of backwards compatibility with early versions
- * of PHP 5, you must not use the $hash[$key] syntax; if you do
- * our version of offsetGet is never called.
- */
-class HTMLPurifier_StringHash extends ArrayObject
-{
- protected $accessed = array();
-
- /**
- * Retrieves a value, and logs the access.
- */
- public function offsetGet($index) {
- $this->accessed[$index] = true;
- return parent::offsetGet($index);
- }
-
- /**
- * Returns a lookup array of all array indexes that have been accessed.
- * @return Array in form array($index => true).
- */
- public function getAccessed() {
- return $this->accessed;
- }
-
- /**
- * Resets the access array.
- */
- public function resetAccessed() {
- $this->accessed = array();
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/StringHashParser.php b/extlib/HTMLPurifier/HTMLPurifier/StringHashParser.php
deleted file mode 100644
index f3e70c712..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/StringHashParser.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Parses string hash files. File format is as such:
- *
- * DefaultKeyValue
- * KEY: Value
- * KEY2: Value2
- * --MULTILINE-KEY--
- * Multiline
- * value.
- *
- * Which would output something similar to:
- *
- * array(
- * 'ID' => 'DefaultKeyValue',
- * 'KEY' => 'Value',
- * 'KEY2' => 'Value2',
- * 'MULTILINE-KEY' => "Multiline\nvalue.\n",
- * )
- *
- * We use this as an easy to use file-format for configuration schema
- * files, but the class itself is usage agnostic.
- *
- * You can use ---- to forcibly terminate parsing of a single string-hash;
- * this marker is used in multi string-hashes to delimit boundaries.
- */
-class HTMLPurifier_StringHashParser
-{
-
- public $default = 'ID';
-
- /**
- * Parses a file that contains a single string-hash.
- */
- public function parseFile($file) {
- if (!file_exists($file)) return false;
- $fh = fopen($file, 'r');
- if (!$fh) return false;
- $ret = $this->parseHandle($fh);
- fclose($fh);
- return $ret;
- }
-
- /**
- * Parses a file that contains multiple string-hashes delimited by '----'
- */
- public function parseMultiFile($file) {
- if (!file_exists($file)) return false;
- $ret = array();
- $fh = fopen($file, 'r');
- if (!$fh) return false;
- while (!feof($fh)) {
- $ret[] = $this->parseHandle($fh);
- }
- fclose($fh);
- return $ret;
- }
-
- /**
- * Internal parser that acepts a file handle.
- * @note While it's possible to simulate in-memory parsing by using
- * custom stream wrappers, if such a use-case arises we should
- * factor out the file handle into its own class.
- * @param $fh File handle with pointer at start of valid string-hash
- * block.
- */
- protected function parseHandle($fh) {
- $state = false;
- $single = false;
- $ret = array();
- do {
- $line = fgets($fh);
- if ($line === false) break;
- $line = rtrim($line, "\n\r");
- if (!$state && $line === '') continue;
- if ($line === '----') break;
- if (strncmp('--#', $line, 3) === 0) {
- // Comment
- continue;
- } elseif (strncmp('--', $line, 2) === 0) {
- // Multiline declaration
- $state = trim($line, '- ');
- if (!isset($ret[$state])) $ret[$state] = '';
- continue;
- } elseif (!$state) {
- $single = true;
- if (strpos($line, ':') !== false) {
- // Single-line declaration
- list($state, $line) = explode(':', $line, 2);
- $line = trim($line);
- } else {
- // Use default declaration
- $state = $this->default;
- }
- }
- if ($single) {
- $ret[$state] = $line;
- $single = false;
- $state = false;
- } else {
- $ret[$state] .= "$line\n";
- }
- } while (!feof($fh));
- return $ret;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/TagTransform.php b/extlib/HTMLPurifier/HTMLPurifier/TagTransform.php
deleted file mode 100644
index 210a44721..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/TagTransform.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Defines a mutation of an obsolete tag into a valid tag.
- */
-abstract class HTMLPurifier_TagTransform
-{
-
- /**
- * Tag name to transform the tag to.
- */
- public $transform_to;
-
- /**
- * Transforms the obsolete tag into the valid tag.
- * @param $tag Tag to be transformed.
- * @param $config Mandatory HTMLPurifier_Config object
- * @param $context Mandatory HTMLPurifier_Context object
- */
- abstract public function transform($tag, $config, $context);
-
- /**
- * Prepends CSS properties to the style attribute, creating the
- * attribute if it doesn't exist.
- * @warning Copied over from AttrTransform, be sure to keep in sync
- * @param $attr Attribute array to process (passed by reference)
- * @param $css CSS to prepend
- */
- protected function prependCSS(&$attr, $css) {
- $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
- $attr['style'] = $css . $attr['style'];
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php b/extlib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
deleted file mode 100644
index ed2463786..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Transforms FONT tags to the proper form (SPAN with CSS styling)
- *
- * This transformation takes the three proprietary attributes of FONT and
- * transforms them into their corresponding CSS attributes. These are color,
- * face, and size.
- *
- * @note Size is an interesting case because it doesn't map cleanly to CSS.
- * Thanks to
- * http://style.cleverchimp.com/font_size_intervals/altintervals.html
- * for reasonable mappings.
- * @warning This doesn't work completely correctly; specifically, this
- * TagTransform operates before well-formedness is enforced, so
- * the "active formatting elements" algorithm doesn't get applied.
- */
-class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
-{
-
- public $transform_to = 'span';
-
- protected $_size_lookup = array(
- '0' => 'xx-small',
- '1' => 'xx-small',
- '2' => 'small',
- '3' => 'medium',
- '4' => 'large',
- '5' => 'x-large',
- '6' => 'xx-large',
- '7' => '300%',
- '-1' => 'smaller',
- '-2' => '60%',
- '+1' => 'larger',
- '+2' => '150%',
- '+3' => '200%',
- '+4' => '300%'
- );
-
- public function transform($tag, $config, $context) {
-
- if ($tag instanceof HTMLPurifier_Token_End) {
- $new_tag = clone $tag;
- $new_tag->name = $this->transform_to;
- return $new_tag;
- }
-
- $attr = $tag->attr;
- $prepend_style = '';
-
- // handle color transform
- if (isset($attr['color'])) {
- $prepend_style .= 'color:' . $attr['color'] . ';';
- unset($attr['color']);
- }
-
- // handle face transform
- if (isset($attr['face'])) {
- $prepend_style .= 'font-family:' . $attr['face'] . ';';
- unset($attr['face']);
- }
-
- // handle size transform
- if (isset($attr['size'])) {
- // normalize large numbers
- if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
- $size = (int) $attr['size'];
- if ($size < -2) $attr['size'] = '-2';
- if ($size > 4) $attr['size'] = '+4';
- } else {
- $size = (int) $attr['size'];
- if ($size > 7) $attr['size'] = '7';
- }
- if (isset($this->_size_lookup[$attr['size']])) {
- $prepend_style .= 'font-size:' .
- $this->_size_lookup[$attr['size']] . ';';
- }
- unset($attr['size']);
- }
-
- if ($prepend_style) {
- $attr['style'] = isset($attr['style']) ?
- $prepend_style . $attr['style'] :
- $prepend_style;
- }
-
- $new_tag = clone $tag;
- $new_tag->name = $this->transform_to;
- $new_tag->attr = $attr;
-
- return $new_tag;
-
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php b/extlib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
deleted file mode 100644
index 0e36130f2..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Simple transformation, just change tag name to something else,
- * and possibly add some styling. This will cover most of the deprecated
- * tag cases.
- */
-class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
-{
-
- protected $style;
-
- /**
- * @param $transform_to Tag name to transform to.
- * @param $style CSS style to add to the tag
- */
- public function __construct($transform_to, $style = null) {
- $this->transform_to = $transform_to;
- $this->style = $style;
- }
-
- public function transform($tag, $config, $context) {
- $new_tag = clone $tag;
- $new_tag->name = $this->transform_to;
- if (!is_null($this->style) &&
- ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
- ) {
- $this->prependCSS($new_tag->attr, $this->style);
- }
- return $new_tag;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token.php b/extlib/HTMLPurifier/HTMLPurifier/Token.php
deleted file mode 100644
index 7900e6cb1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Abstract base token class that all others inherit from.
- */
-class HTMLPurifier_Token {
- public $line; /**< Line number node was on in source document. Null if unknown. */
- public $col; /**< Column of line node was on in source document. Null if unknown. */
-
- /**
- * Lookup array of processing that this token is exempt from.
- * Currently, valid values are "ValidateAttributes" and
- * "MakeWellFormed_TagClosedError"
- */
- public $armor = array();
-
- /**
- * Used during MakeWellFormed.
- */
- public $skip;
- public $rewind;
- public $carryover;
-
- public function __get($n) {
- if ($n === 'type') {
- trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
- switch (get_class($this)) {
- case 'HTMLPurifier_Token_Start': return 'start';
- case 'HTMLPurifier_Token_Empty': return 'empty';
- case 'HTMLPurifier_Token_End': return 'end';
- case 'HTMLPurifier_Token_Text': return 'text';
- case 'HTMLPurifier_Token_Comment': return 'comment';
- default: return null;
- }
- }
- }
-
- /**
- * Sets the position of the token in the source document.
- */
- public function position($l = null, $c = null) {
- $this->line = $l;
- $this->col = $c;
- }
-
- /**
- * Convenience function for DirectLex settings line/col position.
- */
- public function rawPosition($l, $c) {
- if ($c === -1) $l++;
- $this->line = $l;
- $this->col = $c;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token/Comment.php b/extlib/HTMLPurifier/HTMLPurifier/Token/Comment.php
deleted file mode 100644
index dc6bdcabb..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token/Comment.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Concrete comment token class. Generally will be ignored.
- */
-class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
-{
- public $data; /**< Character data within comment. */
- public $is_whitespace = true;
- /**
- * Transparent constructor.
- *
- * @param $data String comment data.
- */
- public function __construct($data, $line = null, $col = null) {
- $this->data = $data;
- $this->line = $line;
- $this->col = $col;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token/Empty.php b/extlib/HTMLPurifier/HTMLPurifier/Token/Empty.php
deleted file mode 100644
index 2a82b47ad..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token/Empty.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Concrete empty token class.
- */
-class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token/End.php b/extlib/HTMLPurifier/HTMLPurifier/Token/End.php
deleted file mode 100644
index 353e79daf..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token/End.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Concrete end token class.
- *
- * @warning This class accepts attributes even though end tags cannot. This
- * is for optimization reasons, as under normal circumstances, the Lexers
- * do not pass attributes.
- */
-class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
-{
- /**
- * Token that started this node. Added by MakeWellFormed. Please
- * do not edit this!
- */
- public $start;
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token/Start.php b/extlib/HTMLPurifier/HTMLPurifier/Token/Start.php
deleted file mode 100644
index e0e14fc62..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token/Start.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Concrete start token class.
- */
-class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token/Tag.php b/extlib/HTMLPurifier/HTMLPurifier/Token/Tag.php
deleted file mode 100644
index 798be028e..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token/Tag.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Abstract class of a tag token (start, end or empty), and its behavior.
- */
-class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
-{
- /**
- * Static bool marker that indicates the class is a tag.
- *
- * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
- * without having to use a function call <tt>is_a()</tt>.
- */
- public $is_tag = true;
-
- /**
- * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
- *
- * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
- * be lower-casing them, but these tokens cater to HTML tags, which are
- * insensitive.
- */
- public $name;
-
- /**
- * Associative array of the tag's attributes.
- */
- public $attr = array();
-
- /**
- * Non-overloaded constructor, which lower-cases passed tag name.
- *
- * @param $name String name.
- * @param $attr Associative array of attributes.
- */
- public function __construct($name, $attr = array(), $line = null, $col = null) {
- $this->name = ctype_lower($name) ? $name : strtolower($name);
- foreach ($attr as $key => $value) {
- // normalization only necessary when key is not lowercase
- if (!ctype_lower($key)) {
- $new_key = strtolower($key);
- if (!isset($attr[$new_key])) {
- $attr[$new_key] = $attr[$key];
- }
- if ($new_key !== $key) {
- unset($attr[$key]);
- }
- }
- }
- $this->attr = $attr;
- $this->line = $line;
- $this->col = $col;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/Token/Text.php b/extlib/HTMLPurifier/HTMLPurifier/Token/Text.php
deleted file mode 100644
index 82efd823d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/Token/Text.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Concrete text token class.
- *
- * Text tokens comprise of regular parsed character data (PCDATA) and raw
- * character data (from the CDATA sections). Internally, their
- * data is parsed with all entities expanded. Surprisingly, the text token
- * does have a "tag name" called #PCDATA, which is how the DTD represents it
- * in permissible child nodes.
- */
-class HTMLPurifier_Token_Text extends HTMLPurifier_Token
-{
-
- public $name = '#PCDATA'; /**< PCDATA tag name compatible with DTD. */
- public $data; /**< Parsed character data of text. */
- public $is_whitespace; /**< Bool indicating if node is whitespace. */
-
- /**
- * Constructor, accepts data and determines if it is whitespace.
- *
- * @param $data String parsed character data.
- */
- public function __construct($data, $line = null, $col = null) {
- $this->data = $data;
- $this->is_whitespace = ctype_space($data);
- $this->line = $line;
- $this->col = $col;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/TokenFactory.php b/extlib/HTMLPurifier/HTMLPurifier/TokenFactory.php
deleted file mode 100644
index 7cf48fb41..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/TokenFactory.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
- * Factory for token generation.
- *
- * @note Doing some benchmarking indicates that the new operator is much
- * slower than the clone operator (even discounting the cost of the
- * constructor). This class is for that optimization.
- * Other then that, there's not much point as we don't
- * maintain parallel HTMLPurifier_Token hierarchies (the main reason why
- * you'd want to use an abstract factory).
- * @todo Port DirectLex to use this
- */
-class HTMLPurifier_TokenFactory
-{
-
- /**
- * Prototypes that will be cloned.
- * @private
- */
- // p stands for prototype
- private $p_start, $p_end, $p_empty, $p_text, $p_comment;
-
- /**
- * Generates blank prototypes for cloning.
- */
- public function __construct() {
- $this->p_start = new HTMLPurifier_Token_Start('', array());
- $this->p_end = new HTMLPurifier_Token_End('');
- $this->p_empty = new HTMLPurifier_Token_Empty('', array());
- $this->p_text = new HTMLPurifier_Token_Text('');
- $this->p_comment= new HTMLPurifier_Token_Comment('');
- }
-
- /**
- * Creates a HTMLPurifier_Token_Start.
- * @param $name Tag name
- * @param $attr Associative array of attributes
- * @return Generated HTMLPurifier_Token_Start
- */
- public function createStart($name, $attr = array()) {
- $p = clone $this->p_start;
- $p->__construct($name, $attr);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_End.
- * @param $name Tag name
- * @return Generated HTMLPurifier_Token_End
- */
- public function createEnd($name) {
- $p = clone $this->p_end;
- $p->__construct($name);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_Empty.
- * @param $name Tag name
- * @param $attr Associative array of attributes
- * @return Generated HTMLPurifier_Token_Empty
- */
- public function createEmpty($name, $attr = array()) {
- $p = clone $this->p_empty;
- $p->__construct($name, $attr);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_Text.
- * @param $data Data of text token
- * @return Generated HTMLPurifier_Token_Text
- */
- public function createText($data) {
- $p = clone $this->p_text;
- $p->__construct($data);
- return $p;
- }
-
- /**
- * Creates a HTMLPurifier_Token_Comment.
- * @param $data Data of comment token
- * @return Generated HTMLPurifier_Token_Comment
- */
- public function createComment($data) {
- $p = clone $this->p_comment;
- $p->__construct($data);
- return $p;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URI.php b/extlib/HTMLPurifier/HTMLPurifier/URI.php
deleted file mode 100644
index 8b50d0d18..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URI.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/**
- * HTML Purifier's internal representation of a URI.
- * @note
- * Internal data-structures are completely escaped. If the data needs
- * to be used in a non-URI context (which is very unlikely), be sure
- * to decode it first. The URI may not necessarily be well-formed until
- * validate() is called.
- */
-class HTMLPurifier_URI
-{
-
- public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
-
- /**
- * @note Automatically normalizes scheme and port
- */
- public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
- $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
- $this->userinfo = $userinfo;
- $this->host = $host;
- $this->port = is_null($port) ? $port : (int) $port;
- $this->path = $path;
- $this->query = $query;
- $this->fragment = $fragment;
- }
-
- /**
- * Retrieves a scheme object corresponding to the URI's scheme/default
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return Scheme object appropriate for validating this URI
- */
- public function getSchemeObj($config, $context) {
- $registry = HTMLPurifier_URISchemeRegistry::instance();
- if ($this->scheme !== null) {
- $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
- if (!$scheme_obj) return false; // invalid scheme, clean it out
- } else {
- // no scheme: retrieve the default one
- $def = $config->getDefinition('URI');
- $scheme_obj = $registry->getScheme($def->defaultScheme, $config, $context);
- if (!$scheme_obj) {
- // something funky happened to the default scheme object
- trigger_error(
- 'Default scheme object "' . $def->defaultScheme . '" was not readable',
- E_USER_WARNING
- );
- return false;
- }
- }
- return $scheme_obj;
- }
-
- /**
- * Generic validation method applicable for all schemes. May modify
- * this URI in order to get it into a compliant form.
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return True if validation/filtering succeeds, false if failure
- */
- public function validate($config, $context) {
-
- // ABNF definitions from RFC 3986
- $chars_sub_delims = '!$&\'()*+,;=';
- $chars_gen_delims = ':/?#[]@';
- $chars_pchar = $chars_sub_delims . ':@';
-
- // validate scheme (MUST BE FIRST!)
- if (!is_null($this->scheme) && is_null($this->host)) {
- $def = $config->getDefinition('URI');
- if ($def->defaultScheme === $this->scheme) {
- $this->scheme = null;
- }
- }
-
- // validate host
- if (!is_null($this->host)) {
- $host_def = new HTMLPurifier_AttrDef_URI_Host();
- $this->host = $host_def->validate($this->host, $config, $context);
- if ($this->host === false) $this->host = null;
- }
-
- // validate username
- if (!is_null($this->userinfo)) {
- $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
- $this->userinfo = $encoder->encode($this->userinfo);
- }
-
- // validate port
- if (!is_null($this->port)) {
- if ($this->port < 1 || $this->port > 65535) $this->port = null;
- }
-
- // validate path
- $path_parts = array();
- $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
- if (!is_null($this->host)) {
- // path-abempty (hier and relative)
- $this->path = $segments_encoder->encode($this->path);
- } elseif ($this->path !== '' && $this->path[0] === '/') {
- // path-absolute (hier and relative)
- if (strlen($this->path) >= 2 && $this->path[1] === '/') {
- // This shouldn't ever happen!
- $this->path = '';
- } else {
- $this->path = $segments_encoder->encode($this->path);
- }
- } elseif (!is_null($this->scheme) && $this->path !== '') {
- // path-rootless (hier)
- // Short circuit evaluation means we don't need to check nz
- $this->path = $segments_encoder->encode($this->path);
- } elseif (is_null($this->scheme) && $this->path !== '') {
- // path-noscheme (relative)
- // (once again, not checking nz)
- $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
- $c = strpos($this->path, '/');
- if ($c !== false) {
- $this->path =
- $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
- $segments_encoder->encode(substr($this->path, $c));
- } else {
- $this->path = $segment_nc_encoder->encode($this->path);
- }
- } else {
- // path-empty (hier and relative)
- $this->path = ''; // just to be safe
- }
-
- // qf = query and fragment
- $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
-
- if (!is_null($this->query)) {
- $this->query = $qf_encoder->encode($this->query);
- }
-
- if (!is_null($this->fragment)) {
- $this->fragment = $qf_encoder->encode($this->fragment);
- }
-
- return true;
-
- }
-
- /**
- * Convert URI back to string
- * @return String URI appropriate for output
- */
- public function toString() {
- // reconstruct authority
- $authority = null;
- if (!is_null($this->host)) {
- $authority = '';
- if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
- $authority .= $this->host;
- if(!is_null($this->port)) $authority .= ':' . $this->port;
- }
-
- // reconstruct the result
- $result = '';
- if (!is_null($this->scheme)) $result .= $this->scheme . ':';
- if (!is_null($authority)) $result .= '//' . $authority;
- $result .= $this->path;
- if (!is_null($this->query)) $result .= '?' . $this->query;
- if (!is_null($this->fragment)) $result .= '#' . $this->fragment;
-
- return $result;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIDefinition.php b/extlib/HTMLPurifier/HTMLPurifier/URIDefinition.php
deleted file mode 100644
index ea2b8fe24..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIDefinition.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
-{
-
- public $type = 'URI';
- protected $filters = array();
- protected $postFilters = array();
- protected $registeredFilters = array();
-
- /**
- * HTMLPurifier_URI object of the base specified at %URI.Base
- */
- public $base;
-
- /**
- * String host to consider "home" base, derived off of $base
- */
- public $host;
-
- /**
- * Name of default scheme based on %URI.DefaultScheme and %URI.Base
- */
- public $defaultScheme;
-
- public function __construct() {
- $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
- $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
- $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
- $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
- $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
- }
-
- public function registerFilter($filter) {
- $this->registeredFilters[$filter->name] = $filter;
- }
-
- public function addFilter($filter, $config) {
- $r = $filter->prepare($config);
- if ($r === false) return; // null is ok, for backwards compat
- if ($filter->post) {
- $this->postFilters[$filter->name] = $filter;
- } else {
- $this->filters[$filter->name] = $filter;
- }
- }
-
- protected function doSetup($config) {
- $this->setupMemberVariables($config);
- $this->setupFilters($config);
- }
-
- protected function setupFilters($config) {
- foreach ($this->registeredFilters as $name => $filter) {
- $conf = $config->get('URI.' . $name);
- if ($conf !== false && $conf !== null) {
- $this->addFilter($filter, $config);
- }
- }
- unset($this->registeredFilters);
- }
-
- protected function setupMemberVariables($config) {
- $this->host = $config->get('URI.Host');
- $base_uri = $config->get('URI.Base');
- if (!is_null($base_uri)) {
- $parser = new HTMLPurifier_URIParser();
- $this->base = $parser->parse($base_uri);
- $this->defaultScheme = $this->base->scheme;
- if (is_null($this->host)) $this->host = $this->base->host;
- }
- if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
- }
-
- public function filter(&$uri, $config, $context) {
- foreach ($this->filters as $name => $f) {
- $result = $f->filter($uri, $config, $context);
- if (!$result) return false;
- }
- return true;
- }
-
- public function postFilter(&$uri, $config, $context) {
- foreach ($this->postFilters as $name => $f) {
- $result = $f->filter($uri, $config, $context);
- if (!$result) return false;
- }
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIFilter.php b/extlib/HTMLPurifier/HTMLPurifier/URIFilter.php
deleted file mode 100644
index c116f93df..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIFilter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Chainable filters for custom URI processing.
- *
- * These filters can perform custom actions on a URI filter object,
- * including transformation or blacklisting.
- *
- * @warning This filter is called before scheme object validation occurs.
- * Make sure, if you require a specific scheme object, you
- * you check that it exists. This allows filters to convert
- * proprietary URI schemes into regular ones.
- */
-abstract class HTMLPurifier_URIFilter
-{
-
- /**
- * Unique identifier of filter
- */
- public $name;
-
- /**
- * True if this filter should be run after scheme validation.
- */
- public $post = false;
-
- /**
- * Performs initialization for the filter
- */
- public function prepare($config) {return true;}
-
- /**
- * Filter a URI object
- * @param $uri Reference to URI object variable
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return bool Whether or not to continue processing: false indicates
- * URL is no good, true indicates continue processing. Note that
- * all changes are committed directly on the URI object
- */
- abstract public function filter(&$uri, $config, $context);
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php b/extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
deleted file mode 100644
index d8a39a501..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
-{
- public $name = 'DisableExternal';
- protected $ourHostParts = false;
- public function prepare($config) {
- $our_host = $config->getDefinition('URI')->host;
- if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
- }
- public function filter(&$uri, $config, $context) {
- if (is_null($uri->host)) return true;
- if ($this->ourHostParts === false) return false;
- $host_parts = array_reverse(explode('.', $uri->host));
- foreach ($this->ourHostParts as $i => $x) {
- if (!isset($host_parts[$i])) return false;
- if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php b/extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
deleted file mode 100644
index 881abc43c..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
-{
- public $name = 'DisableExternalResources';
- public function filter(&$uri, $config, $context) {
- if (!$context->get('EmbeddedURI', true)) return true;
- return parent::filter($uri, $config, $context);
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php b/extlib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
deleted file mode 100644
index 045aa0992..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
-{
- public $name = 'HostBlacklist';
- protected $blacklist = array();
- public function prepare($config) {
- $this->blacklist = $config->get('URI.HostBlacklist');
- return true;
- }
- public function filter(&$uri, $config, $context) {
- foreach($this->blacklist as $blacklisted_host_fragment) {
- if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
- return false;
- }
- }
- return true;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php b/extlib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
deleted file mode 100644
index f46ab2630..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-// does not support network paths
-
-class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
-{
- public $name = 'MakeAbsolute';
- protected $base;
- protected $basePathStack = array();
- public function prepare($config) {
- $def = $config->getDefinition('URI');
- $this->base = $def->base;
- if (is_null($this->base)) {
- trigger_error('URI.MakeAbsolute is being ignored due to lack of value for URI.Base configuration', E_USER_WARNING);
- return false;
- }
- $this->base->fragment = null; // fragment is invalid for base URI
- $stack = explode('/', $this->base->path);
- array_pop($stack); // discard last segment
- $stack = $this->_collapseStack($stack); // do pre-parsing
- $this->basePathStack = $stack;
- return true;
- }
- public function filter(&$uri, $config, $context) {
- if (is_null($this->base)) return true; // abort early
- if (
- $uri->path === '' && is_null($uri->scheme) &&
- is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)
- ) {
- // reference to current document
- $uri = clone $this->base;
- return true;
- }
- if (!is_null($uri->scheme)) {
- // absolute URI already: don't change
- if (!is_null($uri->host)) return true;
- $scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) {
- // scheme not recognized
- return false;
- }
- if (!$scheme_obj->hierarchical) {
- // non-hierarchal URI with explicit scheme, don't change
- return true;
- }
- // special case: had a scheme but always is hierarchical and had no authority
- }
- if (!is_null($uri->host)) {
- // network path, don't bother
- return true;
- }
- if ($uri->path === '') {
- $uri->path = $this->base->path;
- } elseif ($uri->path[0] !== '/') {
- // relative path, needs more complicated processing
- $stack = explode('/', $uri->path);
- $new_stack = array_merge($this->basePathStack, $stack);
- if ($new_stack[0] !== '' && !is_null($this->base->host)) {
- array_unshift($new_stack, '');
- }
- $new_stack = $this->_collapseStack($new_stack);
- $uri->path = implode('/', $new_stack);
- } else {
- // absolute path, but still we should collapse
- $uri->path = implode('/', $this->_collapseStack(explode('/', $uri->path)));
- }
- // re-combine
- $uri->scheme = $this->base->scheme;
- if (is_null($uri->userinfo)) $uri->userinfo = $this->base->userinfo;
- if (is_null($uri->host)) $uri->host = $this->base->host;
- if (is_null($uri->port)) $uri->port = $this->base->port;
- return true;
- }
-
- /**
- * Resolve dots and double-dots in a path stack
- */
- private function _collapseStack($stack) {
- $result = array();
- $is_folder = false;
- for ($i = 0; isset($stack[$i]); $i++) {
- $is_folder = false;
- // absorb an internally duplicated slash
- if ($stack[$i] == '' && $i && isset($stack[$i+1])) continue;
- if ($stack[$i] == '..') {
- if (!empty($result)) {
- $segment = array_pop($result);
- if ($segment === '' && empty($result)) {
- // error case: attempted to back out too far:
- // restore the leading slash
- $result[] = '';
- } elseif ($segment === '..') {
- $result[] = '..'; // cannot remove .. with ..
- }
- } else {
- // relative path, preserve the double-dots
- $result[] = '..';
- }
- $is_folder = true;
- continue;
- }
- if ($stack[$i] == '.') {
- // silently absorb
- $is_folder = true;
- continue;
- }
- $result[] = $stack[$i];
- }
- if ($is_folder) $result[] = '';
- return $result;
- }
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php b/extlib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
deleted file mode 100644
index efa10a645..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
-{
- public $name = 'Munge';
- public $post = true;
- private $target, $parser, $doEmbed, $secretKey;
-
- protected $replace = array();
-
- public function prepare($config) {
- $this->target = $config->get('URI.' . $this->name);
- $this->parser = new HTMLPurifier_URIParser();
- $this->doEmbed = $config->get('URI.MungeResources');
- $this->secretKey = $config->get('URI.MungeSecretKey');
- return true;
- }
- public function filter(&$uri, $config, $context) {
- if ($context->get('EmbeddedURI', true) && !$this->doEmbed) return true;
-
- $scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) return true; // ignore unknown schemes, maybe another postfilter did it
- if (is_null($uri->host) || empty($scheme_obj->browsable)) {
- return true;
- }
- // don't redirect if target host is our host
- if ($uri->host === $config->getDefinition('URI')->host) {
- return true;
- }
-
- $this->makeReplace($uri, $config, $context);
- $this->replace = array_map('rawurlencode', $this->replace);
-
- $new_uri = strtr($this->target, $this->replace);
- $new_uri = $this->parser->parse($new_uri);
- // don't redirect if the target host is the same as the
- // starting host
- if ($uri->host === $new_uri->host) return true;
- $uri = $new_uri; // overwrite
- return true;
- }
-
- protected function makeReplace($uri, $config, $context) {
- $string = $uri->toString();
- // always available
- $this->replace['%s'] = $string;
- $this->replace['%r'] = $context->get('EmbeddedURI', true);
- $token = $context->get('CurrentToken', true);
- $this->replace['%n'] = $token ? $token->name : null;
- $this->replace['%m'] = $context->get('CurrentAttr', true);
- $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
- // not always available
- if ($this->secretKey) $this->replace['%t'] = sha1($this->secretKey . ':' . $string);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIParser.php b/extlib/HTMLPurifier/HTMLPurifier/URIParser.php
deleted file mode 100644
index 7179e4ab8..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIParser.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Parses a URI into the components and fragment identifier as specified
- * by RFC 3986.
- */
-class HTMLPurifier_URIParser
-{
-
- /**
- * Instance of HTMLPurifier_PercentEncoder to do normalization with.
- */
- protected $percentEncoder;
-
- public function __construct() {
- $this->percentEncoder = new HTMLPurifier_PercentEncoder();
- }
-
- /**
- * Parses a URI.
- * @param $uri string URI to parse
- * @return HTMLPurifier_URI representation of URI. This representation has
- * not been validated yet and may not conform to RFC.
- */
- public function parse($uri) {
-
- $uri = $this->percentEncoder->normalize($uri);
-
- // Regexp is as per Appendix B.
- // Note that ["<>] are an addition to the RFC's recommended
- // characters, because they represent external delimeters.
- $r_URI = '!'.
- '(([^:/?#"<>]+):)?'. // 2. Scheme
- '(//([^/?#"<>]*))?'. // 4. Authority
- '([^?#"<>]*)'. // 5. Path
- '(\?([^#"<>]*))?'. // 7. Query
- '(#([^"<>]*))?'. // 8. Fragment
- '!';
-
- $matches = array();
- $result = preg_match($r_URI, $uri, $matches);
-
- if (!$result) return false; // *really* invalid URI
-
- // seperate out parts
- $scheme = !empty($matches[1]) ? $matches[2] : null;
- $authority = !empty($matches[3]) ? $matches[4] : null;
- $path = $matches[5]; // always present, can be empty
- $query = !empty($matches[6]) ? $matches[7] : null;
- $fragment = !empty($matches[8]) ? $matches[9] : null;
-
- // further parse authority
- if ($authority !== null) {
- $r_authority = "/^((.+?)@)?(\[[^\]]+\]|[^:]*)(:(\d*))?/";
- $matches = array();
- preg_match($r_authority, $authority, $matches);
- $userinfo = !empty($matches[1]) ? $matches[2] : null;
- $host = !empty($matches[3]) ? $matches[3] : '';
- $port = !empty($matches[4]) ? (int) $matches[5] : null;
- } else {
- $port = $host = $userinfo = null;
- }
-
- return new HTMLPurifier_URI(
- $scheme, $userinfo, $host, $port, $path, $query, $fragment);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme.php
deleted file mode 100644
index 039710fd1..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Validator for the components of a URI for a specific scheme
- */
-class HTMLPurifier_URIScheme
-{
-
- /**
- * Scheme's default port (integer)
- */
- public $default_port = null;
-
- /**
- * Whether or not URIs of this schem are locatable by a browser
- * http and ftp are accessible, while mailto and news are not.
- */
- public $browsable = false;
-
- /**
- * Whether or not the URI always uses <hier_part>, resolves edge cases
- * with making relative URIs absolute
- */
- public $hierarchical = false;
-
- /**
- * Validates the components of a URI
- * @note This implementation should be called by children if they define
- * a default port, as it does port processing.
- * @param $uri Instance of HTMLPurifier_URI
- * @param $config HTMLPurifier_Config object
- * @param $context HTMLPurifier_Context object
- * @return Bool success or failure
- */
- public function validate(&$uri, $config, $context) {
- if ($this->default_port == $uri->port) $uri->port = null;
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
deleted file mode 100644
index 5849bf7ff..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738.
- */
-class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme {
-
- public $default_port = 21;
- public $browsable = true; // usually
- public $hierarchical = true;
-
- public function validate(&$uri, $config, $context) {
- parent::validate($uri, $config, $context);
- $uri->query = null;
-
- // typecode check
- $semicolon_pos = strrpos($uri->path, ';'); // reverse
- if ($semicolon_pos !== false) {
- $type = substr($uri->path, $semicolon_pos + 1); // no semicolon
- $uri->path = substr($uri->path, 0, $semicolon_pos);
- $type_ret = '';
- if (strpos($type, '=') !== false) {
- // figure out whether or not the declaration is correct
- list($key, $typecode) = explode('=', $type, 2);
- if ($key !== 'type') {
- // invalid key, tack it back on encoded
- $uri->path .= '%3B' . $type;
- } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {
- $type_ret = ";type=$typecode";
- }
- } else {
- $uri->path .= '%3B' . $type;
- }
- $uri->path = str_replace(';', '%3B', $uri->path);
- $uri->path .= $type_ret;
- }
-
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/http.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme/http.php
deleted file mode 100644
index b097a31d6..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/http.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Validates http (HyperText Transfer Protocol) as defined by RFC 2616
- */
-class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme {
-
- public $default_port = 80;
- public $browsable = true;
- public $hierarchical = true;
-
- public function validate(&$uri, $config, $context) {
- parent::validate($uri, $config, $context);
- $uri->userinfo = null;
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/https.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme/https.php
deleted file mode 100644
index 29e380919..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/https.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Validates https (Secure HTTP) according to http scheme.
- */
-class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http {
-
- public $default_port = 443;
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
deleted file mode 100644
index c1e2cd5aa..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-// VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
-// email is valid, but be careful!
-
-/**
- * Validates mailto (for E-mail) according to RFC 2368
- * @todo Validate the email address
- * @todo Filter allowed query parameters
- */
-
-class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme {
-
- public $browsable = false;
-
- public function validate(&$uri, $config, $context) {
- parent::validate($uri, $config, $context);
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
- // we need to validate path against RFC 2368's addr-spec
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/news.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme/news.php
deleted file mode 100644
index f5f54f4f5..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/news.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Validates news (Usenet) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme {
-
- public $browsable = false;
-
- public function validate(&$uri, $config, $context) {
- parent::validate($uri, $config, $context);
- $uri->userinfo = null;
- $uri->host = null;
- $uri->port = null;
- $uri->query = null;
- // typecode check needed on path
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php b/extlib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
deleted file mode 100644
index 5bf93ea78..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme {
-
- public $default_port = 119;
- public $browsable = false;
-
- public function validate(&$uri, $config, $context) {
- parent::validate($uri, $config, $context);
- $uri->userinfo = null;
- $uri->query = null;
- return true;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php b/extlib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
deleted file mode 100644
index 576bf7b6d..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Registry for retrieving specific URI scheme validator objects.
- */
-class HTMLPurifier_URISchemeRegistry
-{
-
- /**
- * Retrieve sole instance of the registry.
- * @param $prototype Optional prototype to overload sole instance with,
- * or bool true to reset to default registry.
- * @note Pass a registry object $prototype with a compatible interface and
- * the function will copy it and return it all further times.
- */
- public static function instance($prototype = null) {
- static $instance = null;
- if ($prototype !== null) {
- $instance = $prototype;
- } elseif ($instance === null || $prototype == true) {
- $instance = new HTMLPurifier_URISchemeRegistry();
- }
- return $instance;
- }
-
- /**
- * Cache of retrieved schemes.
- */
- protected $schemes = array();
-
- /**
- * Retrieves a scheme validator object
- * @param $scheme String scheme name like http or mailto
- * @param $config HTMLPurifier_Config object
- * @param $config HTMLPurifier_Context object
- */
- public function getScheme($scheme, $config, $context) {
- if (!$config) $config = HTMLPurifier_Config::createDefault();
-
- // important, otherwise attacker could include arbitrary file
- $allowed_schemes = $config->get('URI.AllowedSchemes');
- if (!$config->get('URI.OverrideAllowedSchemes') &&
- !isset($allowed_schemes[$scheme])
- ) {
- return;
- }
-
- if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
- if (!isset($allowed_schemes[$scheme])) return;
-
- $class = 'HTMLPurifier_URIScheme_' . $scheme;
- if (!class_exists($class)) return;
- $this->schemes[$scheme] = new $class();
- return $this->schemes[$scheme];
- }
-
- /**
- * Registers a custom scheme to the cache, bypassing reflection.
- * @param $scheme Scheme name
- * @param $scheme_obj HTMLPurifier_URIScheme object
- */
- public function register($scheme, $scheme_obj) {
- $this->schemes[$scheme] = $scheme_obj;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/UnitConverter.php b/extlib/HTMLPurifier/HTMLPurifier/UnitConverter.php
deleted file mode 100644
index 545d42622..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/UnitConverter.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * Class for converting between different unit-lengths as specified by
- * CSS.
- */
-class HTMLPurifier_UnitConverter
-{
-
- const ENGLISH = 1;
- const METRIC = 2;
- const DIGITAL = 3;
-
- /**
- * Units information array. Units are grouped into measuring systems
- * (English, Metric), and are assigned an integer representing
- * the conversion factor between that unit and the smallest unit in
- * the system. Numeric indexes are actually magical constants that
- * encode conversion data from one system to the next, with a O(n^2)
- * constraint on memory (this is generally not a problem, since
- * the number of measuring systems is small.)
- */
- protected static $units = array(
- self::ENGLISH => array(
- 'px' => 3, // This is as per CSS 2.1 and Firefox. Your mileage may vary
- 'pt' => 4,
- 'pc' => 48,
- 'in' => 288,
- self::METRIC => array('pt', '0.352777778', 'mm'),
- ),
- self::METRIC => array(
- 'mm' => 1,
- 'cm' => 10,
- self::ENGLISH => array('mm', '2.83464567', 'pt'),
- ),
- );
-
- /**
- * Minimum bcmath precision for output.
- */
- protected $outputPrecision;
-
- /**
- * Bcmath precision for internal calculations.
- */
- protected $internalPrecision;
-
- /**
- * Whether or not BCMath is available
- */
- private $bcmath;
-
- public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) {
- $this->outputPrecision = $output_precision;
- $this->internalPrecision = $internal_precision;
- $this->bcmath = !$force_no_bcmath && function_exists('bcmul');
- }
-
- /**
- * Converts a length object of one unit into another unit.
- * @param HTMLPurifier_Length $length
- * Instance of HTMLPurifier_Length to convert. You must validate()
- * it before passing it here!
- * @param string $to_unit
- * Unit to convert to.
- * @note
- * About precision: This conversion function pays very special
- * attention to the incoming precision of values and attempts
- * to maintain a number of significant figure. Results are
- * fairly accurate up to nine digits. Some caveats:
- * - If a number is zero-padded as a result of this significant
- * figure tracking, the zeroes will be eliminated.
- * - If a number contains less than four sigfigs ($outputPrecision)
- * and this causes some decimals to be excluded, those
- * decimals will be added on.
- */
- public function convert($length, $to_unit) {
-
- if (!$length->isValid()) return false;
-
- $n = $length->getN();
- $unit = $length->getUnit();
-
- if ($n === '0' || $unit === false) {
- return new HTMLPurifier_Length('0', false);
- }
-
- $state = $dest_state = false;
- foreach (self::$units as $k => $x) {
- if (isset($x[$unit])) $state = $k;
- if (isset($x[$to_unit])) $dest_state = $k;
- }
- if (!$state || !$dest_state) return false;
-
- // Some calculations about the initial precision of the number;
- // this will be useful when we need to do final rounding.
- $sigfigs = $this->getSigFigs($n);
- if ($sigfigs < $this->outputPrecision) $sigfigs = $this->outputPrecision;
-
- // BCMath's internal precision deals only with decimals. Use
- // our default if the initial number has no decimals, or increase
- // it by how ever many decimals, thus, the number of guard digits
- // will always be greater than or equal to internalPrecision.
- $log = (int) floor(log(abs($n), 10));
- $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision
-
- for ($i = 0; $i < 2; $i++) {
-
- // Determine what unit IN THIS SYSTEM we need to convert to
- if ($dest_state === $state) {
- // Simple conversion
- $dest_unit = $to_unit;
- } else {
- // Convert to the smallest unit, pending a system shift
- $dest_unit = self::$units[$state][$dest_state][0];
- }
-
- // Do the conversion if necessary
- if ($dest_unit !== $unit) {
- $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);
- $n = $this->mul($n, $factor, $cp);
- $unit = $dest_unit;
- }
-
- // Output was zero, so bail out early. Shouldn't ever happen.
- if ($n === '') {
- $n = '0';
- $unit = $to_unit;
- break;
- }
-
- // It was a simple conversion, so bail out
- if ($dest_state === $state) {
- break;
- }
-
- if ($i !== 0) {
- // Conversion failed! Apparently, the system we forwarded
- // to didn't have this unit. This should never happen!
- return false;
- }
-
- // Pre-condition: $i == 0
-
- // Perform conversion to next system of units
- $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);
- $unit = self::$units[$state][$dest_state][2];
- $state = $dest_state;
-
- // One more loop around to convert the unit in the new system.
-
- }
-
- // Post-condition: $unit == $to_unit
- if ($unit !== $to_unit) return false;
-
- // Useful for debugging:
- //echo "<pre>n";
- //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n</pre>\n";
-
- $n = $this->round($n, $sigfigs);
- if (strpos($n, '.') !== false) $n = rtrim($n, '0');
- $n = rtrim($n, '.');
-
- return new HTMLPurifier_Length($n, $unit);
- }
-
- /**
- * Returns the number of significant figures in a string number.
- * @param string $n Decimal number
- * @return int number of sigfigs
- */
- public function getSigFigs($n) {
- $n = ltrim($n, '0+-');
- $dp = strpos($n, '.'); // decimal position
- if ($dp === false) {
- $sigfigs = strlen(rtrim($n, '0'));
- } else {
- $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character
- if ($dp !== 0) $sigfigs--;
- }
- return $sigfigs;
- }
-
- /**
- * Adds two numbers, using arbitrary precision when available.
- */
- private function add($s1, $s2, $scale) {
- if ($this->bcmath) return bcadd($s1, $s2, $scale);
- else return $this->scale($s1 + $s2, $scale);
- }
-
- /**
- * Multiples two numbers, using arbitrary precision when available.
- */
- private function mul($s1, $s2, $scale) {
- if ($this->bcmath) return bcmul($s1, $s2, $scale);
- else return $this->scale($s1 * $s2, $scale);
- }
-
- /**
- * Divides two numbers, using arbitrary precision when available.
- */
- private function div($s1, $s2, $scale) {
- if ($this->bcmath) return bcdiv($s1, $s2, $scale);
- else return $this->scale($s1 / $s2, $scale);
- }
-
- /**
- * Rounds a number according to the number of sigfigs it should have,
- * using arbitrary precision when available.
- */
- private function round($n, $sigfigs) {
- $new_log = (int) floor(log(abs($n), 10)); // Number of digits left of decimal - 1
- $rp = $sigfigs - $new_log - 1; // Number of decimal places needed
- $neg = $n < 0 ? '-' : ''; // Negative sign
- if ($this->bcmath) {
- if ($rp >= 0) {
- $n = bcadd($n, $neg . '0.' . str_repeat('0', $rp) . '5', $rp + 1);
- $n = bcdiv($n, '1', $rp);
- } else {
- // This algorithm partially depends on the standardized
- // form of numbers that comes out of bcmath.
- $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);
- $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);
- }
- return $n;
- } else {
- return $this->scale(round($n, $sigfigs - $new_log - 1), $rp + 1);
- }
- }
-
- /**
- * Scales a float to $scale digits right of decimal point, like BCMath.
- */
- private function scale($r, $scale) {
- if ($scale < 0) {
- // The f sprintf type doesn't support negative numbers, so we
- // need to cludge things manually. First get the string.
- $r = sprintf('%.0f', (float) $r);
- // Due to floating point precision loss, $r will more than likely
- // look something like 4652999999999.9234. We grab one more digit
- // than we need to precise from $r and then use that to round
- // appropriately.
- $precise = (string) round(substr($r, 0, strlen($r) + $scale), -1);
- // Now we return it, truncating the zero that was rounded off.
- return substr($precise, 0, -1) . str_repeat('0', -$scale + 1);
- }
- return sprintf('%.' . $scale . 'f', (float) $r);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/VarParser.php b/extlib/HTMLPurifier/HTMLPurifier/VarParser.php
deleted file mode 100644
index 68e72ae86..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/VarParser.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Parses string representations into their corresponding native PHP
- * variable type. The base implementation does a simple type-check.
- */
-class HTMLPurifier_VarParser
-{
-
- const STRING = 1;
- const ISTRING = 2;
- const TEXT = 3;
- const ITEXT = 4;
- const INT = 5;
- const FLOAT = 6;
- const BOOL = 7;
- const LOOKUP = 8;
- const ALIST = 9;
- const HASH = 10;
- const MIXED = 11;
-
- /**
- * Lookup table of allowed types. Mainly for backwards compatibility, but
- * also convenient for transforming string type names to the integer constants.
- */
- static public $types = array(
- 'string' => self::STRING,
- 'istring' => self::ISTRING,
- 'text' => self::TEXT,
- 'itext' => self::ITEXT,
- 'int' => self::INT,
- 'float' => self::FLOAT,
- 'bool' => self::BOOL,
- 'lookup' => self::LOOKUP,
- 'list' => self::ALIST,
- 'hash' => self::HASH,
- 'mixed' => self::MIXED
- );
-
- /**
- * Lookup table of types that are string, and can have aliases or
- * allowed value lists.
- */
- static public $stringTypes = array(
- self::STRING => true,
- self::ISTRING => true,
- self::TEXT => true,
- self::ITEXT => true,
- );
-
- /**
- * Validate a variable according to type. Throws
- * HTMLPurifier_VarParserException if invalid.
- * It may return NULL as a valid type if $allow_null is true.
- *
- * @param $var Variable to validate
- * @param $type Type of variable, see HTMLPurifier_VarParser->types
- * @param $allow_null Whether or not to permit null as a value
- * @return Validated and type-coerced variable
- */
- final public function parse($var, $type, $allow_null = false) {
- if (is_string($type)) {
- if (!isset(HTMLPurifier_VarParser::$types[$type])) {
- throw new HTMLPurifier_VarParserException("Invalid type '$type'");
- } else {
- $type = HTMLPurifier_VarParser::$types[$type];
- }
- }
- $var = $this->parseImplementation($var, $type, $allow_null);
- if ($allow_null && $var === null) return null;
- // These are basic checks, to make sure nothing horribly wrong
- // happened in our implementations.
- switch ($type) {
- case (self::STRING):
- case (self::ISTRING):
- case (self::TEXT):
- case (self::ITEXT):
- if (!is_string($var)) break;
- if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);
- return $var;
- case (self::INT):
- if (!is_int($var)) break;
- return $var;
- case (self::FLOAT):
- if (!is_float($var)) break;
- return $var;
- case (self::BOOL):
- if (!is_bool($var)) break;
- return $var;
- case (self::LOOKUP):
- case (self::ALIST):
- case (self::HASH):
- if (!is_array($var)) break;
- if ($type === self::LOOKUP) {
- foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true');
- } elseif ($type === self::ALIST) {
- $keys = array_keys($var);
- if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform');
- }
- return $var;
- case (self::MIXED):
- return $var;
- default:
- $this->errorInconsistent(get_class($this), $type);
- }
- $this->errorGeneric($var, $type);
- }
-
- /**
- * Actually implements the parsing. Base implementation is to not
- * do anything to $var. Subclasses should overload this!
- */
- protected function parseImplementation($var, $type, $allow_null) {
- return $var;
- }
-
- /**
- * Throws an exception.
- */
- protected function error($msg) {
- throw new HTMLPurifier_VarParserException($msg);
- }
-
- /**
- * Throws an inconsistency exception.
- * @note This should not ever be called. It would be called if we
- * extend the allowed values of HTMLPurifier_VarParser without
- * updating subclasses.
- */
- protected function errorInconsistent($class, $type) {
- throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented");
- }
-
- /**
- * Generic error for if a type didn't work.
- */
- protected function errorGeneric($var, $type) {
- $vtype = gettype($var);
- $this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype");
- }
-
- static public function getTypeName($type) {
- static $lookup;
- if (!$lookup) {
- // Lazy load the alternative lookup table
- $lookup = array_flip(HTMLPurifier_VarParser::$types);
- }
- if (!isset($lookup[$type])) return 'unknown';
- return $lookup[$type];
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php b/extlib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
deleted file mode 100644
index c954250e9..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Performs safe variable parsing based on types which can be used by
- * users. This may not be able to represent all possible data inputs,
- * however.
- */
-class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
-{
-
- protected function parseImplementation($var, $type, $allow_null) {
- if ($allow_null && $var === null) return null;
- switch ($type) {
- // Note: if code "breaks" from the switch, it triggers a generic
- // exception to be thrown. Specific errors can be specifically
- // done here.
- case self::MIXED :
- case self::ISTRING :
- case self::STRING :
- case self::TEXT :
- case self::ITEXT :
- return $var;
- case self::INT :
- if (is_string($var) && ctype_digit($var)) $var = (int) $var;
- return $var;
- case self::FLOAT :
- if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;
- return $var;
- case self::BOOL :
- if (is_int($var) && ($var === 0 || $var === 1)) {
- $var = (bool) $var;
- } elseif (is_string($var)) {
- if ($var == 'on' || $var == 'true' || $var == '1') {
- $var = true;
- } elseif ($var == 'off' || $var == 'false' || $var == '0') {
- $var = false;
- } else {
- throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
- }
- }
- return $var;
- case self::ALIST :
- case self::HASH :
- case self::LOOKUP :
- if (is_string($var)) {
- // special case: technically, this is an array with
- // a single empty string item, but having an empty
- // array is more intuitive
- if ($var == '') return array();
- if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
- // simplistic string to array method that only works
- // for simple lists of tag names or alphanumeric characters
- $var = explode(',',$var);
- } else {
- $var = preg_split('/(,|[\n\r]+)/', $var);
- }
- // remove spaces
- foreach ($var as $i => $j) $var[$i] = trim($j);
- if ($type === self::HASH) {
- // key:value,key2:value2
- $nvar = array();
- foreach ($var as $keypair) {
- $c = explode(':', $keypair, 2);
- if (!isset($c[1])) continue;
- $nvar[$c[0]] = $c[1];
- }
- $var = $nvar;
- }
- }
- if (!is_array($var)) break;
- $keys = array_keys($var);
- if ($keys === array_keys($keys)) {
- if ($type == self::ALIST) return $var;
- elseif ($type == self::LOOKUP) {
- $new = array();
- foreach ($var as $key) {
- $new[$key] = true;
- }
- return $new;
- } else break;
- }
- if ($type === self::LOOKUP) {
- foreach ($var as $key => $value) {
- $var[$key] = true;
- }
- }
- return $var;
- default:
- $this->errorInconsistent(__CLASS__, $type);
- }
- $this->errorGeneric($var, $type);
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/VarParser/Native.php b/extlib/HTMLPurifier/HTMLPurifier/VarParser/Native.php
deleted file mode 100644
index b02a6de54..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/VarParser/Native.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This variable parser uses PHP's internal code engine. Because it does
- * this, it can represent all inputs; however, it is dangerous and cannot
- * be used by users.
- */
-class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
-{
-
- protected function parseImplementation($var, $type, $allow_null) {
- return $this->evalExpression($var);
- }
-
- protected function evalExpression($expr) {
- $var = null;
- $result = eval("\$var = $expr;");
- if ($result === false) {
- throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
- }
- return $var;
- }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/HTMLPurifier/VarParserException.php b/extlib/HTMLPurifier/HTMLPurifier/VarParserException.php
deleted file mode 100644
index 5df341495..000000000
--- a/extlib/HTMLPurifier/HTMLPurifier/VarParserException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Exception type for HTMLPurifier_VarParser
- */
-class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/extlib/HTMLPurifier/LICENSE b/extlib/HTMLPurifier/LICENSE
deleted file mode 100644
index 8c88a20d4..000000000
--- a/extlib/HTMLPurifier/LICENSE
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
- vim: et sw=4 sts=4
diff --git a/js/jquery.form.js b/js/jquery.form.js
index dde394270..936b847ab 100644
--- a/js/jquery.form.js
+++ b/js/jquery.form.js
@@ -1,660 +1,632 @@
-/*
- * jQuery Form Plugin
- * version: 2.36 (07-NOV-2009)
- * @requires jQuery v1.2.6 or later
- *
- * Examples and documentation at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- */
-;(function($) {
-
-/*
- Usage Note:
- -----------
- Do not use both ajaxSubmit and ajaxForm on the same form. These
- functions are intended to be exclusive. Use ajaxSubmit if you want
- to bind your own submit handler to the form. For example,
-
- $(document).ready(function() {
- $('#myForm').bind('submit', function() {
- $(this).ajaxSubmit({
- target: '#output'
- });
- return false; // <-- important!
- });
- });
-
- Use ajaxForm when you want the plugin to manage all the event binding
- for you. For example,
-
- $(document).ready(function() {
- $('#myForm').ajaxForm({
- target: '#output'
- });
- });
-
- When using ajaxForm, the ajaxSubmit function will be invoked for you
- at the appropriate time.
-*/
-
-/**
- * ajaxSubmit() provides a mechanism for immediately submitting
- * an HTML form using AJAX.
- */
-$.fn.ajaxSubmit = function(options) {
- // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
- if (!this.length) {
- log('ajaxSubmit: skipping submit process - no element selected');
- return this;
- }
-
- if (typeof options == 'function')
- options = { success: options };
-
- var url = $.trim(this.attr('action'));
- if (url) {
- // clean url (don't include hash vaue)
- url = (url.match(/^([^#]+)/)||[])[1];
- }
- url = url || window.location.href || '';
-
- options = $.extend({
- url: url,
- type: this.attr('method') || 'GET',
- iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
- }, options || {});
-
- // hook for manipulating the form data before it is extracted;
- // convenient for use with rich editors like tinyMCE or FCKEditor
- var veto = {};
- this.trigger('form-pre-serialize', [this, options, veto]);
- if (veto.veto) {
- log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
- return this;
- }
-
- // provide opportunity to alter form data before it is serialized
- if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
- log('ajaxSubmit: submit aborted via beforeSerialize callback');
- return this;
- }
-
- var a = this.formToArray(options.semantic);
- if (options.data) {
- options.extraData = options.data;
- for (var n in options.data) {
- if(options.data[n] instanceof Array) {
- for (var k in options.data[n])
- a.push( { name: n, value: options.data[n][k] } );
- }
- else
- a.push( { name: n, value: options.data[n] } );
- }
- }
-
- // give pre-submit callback an opportunity to abort the submit
- if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
- log('ajaxSubmit: submit aborted via beforeSubmit callback');
- return this;
- }
-
- // fire vetoable 'validate' event
- this.trigger('form-submit-validate', [a, this, options, veto]);
- if (veto.veto) {
- log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
- return this;
- }
-
- var q = $.param(a);
-
- if (options.type.toUpperCase() == 'GET') {
- options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
- options.data = null; // data is null for 'get'
- }
- else
- options.data = q; // data is the query string for 'post'
-
- var $form = this, callbacks = [];
- if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
- if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
-
- // perform a load on the target only if dataType is not provided
- if (!options.dataType && options.target) {
- var oldSuccess = options.success || function(){};
- callbacks.push(function(data) {
- $(options.target).html(data).each(oldSuccess, arguments);
- });
- }
- else if (options.success)
- callbacks.push(options.success);
-
- options.success = function(data, status) {
- for (var i=0, max=callbacks.length; i < max; i++)
- callbacks[i].apply(options, [data, status, $form]);
- };
-
- // are there files to upload?
- var files = $('input:file', this).fieldValue();
- var found = false;
- for (var j=0; j < files.length; j++)
- if (files[j])
- found = true;
-
- var multipart = false;
-// var mp = 'multipart/form-data';
-// multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
-
- // options.iframe allows user to force iframe mode
- // 06-NOV-09: now defaulting to iframe mode if file input is detected
- if ((files.length && options.iframe !== false) || options.iframe || found || multipart) {
- // hack to fix Safari hang (thanks to Tim Molendijk for this)
- // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
- if (options.closeKeepAlive)
- $.get(options.closeKeepAlive, fileUpload);
- else
- fileUpload();
- }
- else
- $.ajax(options);
-
- // fire 'notify' event
- this.trigger('form-submit-notify', [this, options]);
- return this;
-
-
- // private function for handling file uploads (hat tip to YAHOO!)
- function fileUpload() {
- var form = $form[0];
-
- if ($(':input[name=submit]', form).length) {
- alert('Error: Form elements must not be named "submit".');
- return;
- }
-
- var opts = $.extend({}, $.ajaxSettings, options);
- var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
-
- var id = 'jqFormIO' + (new Date().getTime());
- var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" />');
- var io = $io[0];
-
- $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
- var xhr = { // mock object
- aborted: 0,
- responseText: null,
- responseXML: null,
- status: 0,
- statusText: 'n/a',
- getAllResponseHeaders: function() {},
- getResponseHeader: function() {},
- setRequestHeader: function() {},
- abort: function() {
- this.aborted = 1;
- $io.attr('src', opts.iframeSrc); // abort op in progress
- }
- };
-
- var g = opts.global;
- // trigger ajax global events so that activity/block indicators work like normal
- if (g && ! $.active++) $.event.trigger("ajaxStart");
- if (g) $.event.trigger("ajaxSend", [xhr, opts]);
-
- if (s.beforeSend && s.beforeSend(xhr, s) === false) {
- s.global && $.active--;
- return;
- }
- if (xhr.aborted)
- return;
-
- var cbInvoked = 0;
- var timedOut = 0;
-
- // add submitting element to data if we know it
- var sub = form.clk;
- if (sub) {
- var n = sub.name;
- if (n && !sub.disabled) {
- options.extraData = options.extraData || {};
- options.extraData[n] = sub.value;
- if (sub.type == "image") {
- options.extraData[name+'.x'] = form.clk_x;
- options.extraData[name+'.y'] = form.clk_y;
- }
- }
- }
-
- // take a breath so that pending repaints get some cpu time before the upload starts
- setTimeout(function() {
- // make sure form attrs are set
- var t = $form.attr('target'), a = $form.attr('action');
-
- // update form attrs in IE friendly way
- form.setAttribute('target',id);
- if (form.getAttribute('method') != 'POST')
- form.setAttribute('method', 'POST');
- if (form.getAttribute('action') != opts.url)
- form.setAttribute('action', opts.url);
-
- // ie borks in some cases when setting encoding
- if (! options.skipEncodingOverride) {
- $form.attr({
- encoding: 'multipart/form-data',
- enctype: 'multipart/form-data'
- });
- }
-
- // support timout
- if (opts.timeout)
- setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
-
- // add "extra" data to form if provided in options
- var extraInputs = [];
- try {
- if (options.extraData)
- for (var n in options.extraData)
- extraInputs.push(
- $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
- .appendTo(form)[0]);
-
- // add iframe to doc and submit the form
- $io.appendTo('body');
- io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
- form.submit();
- }
- finally {
- // reset attrs and remove "extra" input elements
- form.setAttribute('action',a);
- t ? form.setAttribute('target', t) : $form.removeAttr('target');
- $(extraInputs).remove();
- }
- }, 10);
-
- var domCheckCount = 50;
-
- function cb() {
- if (cbInvoked++) return;
-
- io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
-
- var ok = true;
- try {
- if (timedOut) throw 'timeout';
- // extract the server response from the iframe
- var data, doc;
-
- doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-
- var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
- log('isXml='+isXml);
- if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
- if (--domCheckCount) {
- // in some browsers (Opera) the iframe DOM is not always traversable when
- // the onload callback fires, so we loop a bit to accommodate
- cbInvoked = 0;
- setTimeout(cb, 100);
- return;
- }
- log('Could not access iframe DOM after 50 tries.');
- return;
- }
-
- xhr.responseText = doc.body ? doc.body.innerHTML : null;
- xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
- xhr.getResponseHeader = function(header){
- var headers = {'content-type': opts.dataType};
- return headers[header];
- };
-
- if (opts.dataType == 'json' || opts.dataType == 'script') {
- // see if user embedded response in textarea
- var ta = doc.getElementsByTagName('textarea')[0];
- if (ta)
- xhr.responseText = ta.value;
- else {
- // account for browsers injecting pre around json response
- var pre = doc.getElementsByTagName('pre')[0];
- if (pre)
- xhr.responseText = pre.innerHTML;
- }
- }
- else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
- xhr.responseXML = toXml(xhr.responseText);
- }
- data = $.httpData(xhr, opts.dataType);
- }
- catch(e){
- ok = false;
- $.handleError(opts, xhr, 'error', e);
- }
-
- // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
- if (ok) {
- opts.success(data, 'success');
- if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
- }
- if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
- if (g && ! --$.active) $.event.trigger("ajaxStop");
- if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
-
- // clean up
- setTimeout(function() {
- $io.remove();
- xhr.responseXML = null;
- }, 100);
- };
-
- function toXml(s, doc) {
- if (window.ActiveXObject) {
- doc = new ActiveXObject('Microsoft.XMLDOM');
- doc.async = 'false';
- doc.loadXML(s);
- }
- else
- doc = (new DOMParser()).parseFromString(s, 'text/xml');
- return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
- };
- };
-};
-
-/**
- * ajaxForm() provides a mechanism for fully automating form submission.
- *
- * The advantages of using this method instead of ajaxSubmit() are:
- *
- * 1: This method will include coordinates for <input type="image" /> elements (if the element
- * is used to submit the form).
- * 2. This method will include the submit element's name/value data (for the element that was
- * used to submit the form).
- * 3. This method binds the submit() method to the form for you.
- *
- * The options argument for ajaxForm works exactly as it does for ajaxSubmit. ajaxForm merely
- * passes the options argument along after properly binding events for submit elements and
- * the form itself.
- */
-$.fn.ajaxForm = function(options) {
- return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
- $(this).ajaxSubmit(options);
- return false;
- }).bind('click.form-plugin', function(e) {
- var target = e.target;
- var $el = $(target);
- if (!($el.is(":submit,input:image"))) {
- // is this a child element of the submit el? (ex: a span within a button)
- var t = $el.closest(':submit');
- if (t.length == 0)
- return;
- target = t[0];
- }
- var form = this;
- form.clk = target;
- if (target.type == 'image') {
- if (e.offsetX != undefined) {
- form.clk_x = e.offsetX;
- form.clk_y = e.offsetY;
- } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
- var offset = $el.offset();
- form.clk_x = e.pageX - offset.left;
- form.clk_y = e.pageY - offset.top;
- } else {
- form.clk_x = e.pageX - target.offsetLeft;
- form.clk_y = e.pageY - target.offsetTop;
- }
- }
- // clear form vars
- setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
- });
-};
-
-// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
-$.fn.ajaxFormUnbind = function() {
- return this.unbind('submit.form-plugin click.form-plugin');
-};
-
-/**
- * formToArray() gathers form element data into an array of objects that can
- * be passed to any of the following ajax functions: $.get, $.post, or load.
- * Each object in the array has both a 'name' and 'value' property. An example of
- * an array for a simple login form might be:
- *
- * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * It is this array that is passed to pre-submit callback functions provided to the
- * ajaxSubmit() and ajaxForm() methods.
- */
-$.fn.formToArray = function(semantic) {
- var a = [];
- if (this.length == 0) return a;
-
- var form = this[0];
- var els = semantic ? form.getElementsByTagName('*') : form.elements;
- if (!els) return a;
- for(var i=0, max=els.length; i < max; i++) {
- var el = els[i];
- var n = el.name;
- if (!n) continue;
-
- if (semantic && form.clk && el.type == "image") {
- // handle image inputs on the fly when semantic == true
- if(!el.disabled && form.clk == el) {
- a.push({name: n, value: $(el).val()});
- a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
- }
- continue;
- }
-
- var v = $.fieldValue(el, true);
- if (v && v.constructor == Array) {
- for(var j=0, jmax=v.length; j < jmax; j++)
- a.push({name: n, value: v[j]});
- }
- else if (v !== null && typeof v != 'undefined')
- a.push({name: n, value: v});
- }
-
- if (!semantic && form.clk) {
- // input type=='image' are not found in elements array! handle it here
- var $input = $(form.clk), input = $input[0], n = input.name;
- if (n && !input.disabled && input.type == 'image') {
- a.push({name: n, value: $input.val()});
- a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
- }
- }
- return a;
-};
-
-/**
- * Serializes form data into a 'submittable' string. This method will return a string
- * in the format: name1=value1&amp;name2=value2
- */
-$.fn.formSerialize = function(semantic) {
- //hand off to jQuery.param for proper encoding
- return $.param(this.formToArray(semantic));
-};
-
-/**
- * Serializes all field elements in the jQuery object into a query string.
- * This method will return a string in the format: name1=value1&amp;name2=value2
- */
-$.fn.fieldSerialize = function(successful) {
- var a = [];
- this.each(function() {
- var n = this.name;
- if (!n) return;
- var v = $.fieldValue(this, successful);
- if (v && v.constructor == Array) {
- for (var i=0,max=v.length; i < max; i++)
- a.push({name: n, value: v[i]});
- }
- else if (v !== null && typeof v != 'undefined')
- a.push({name: this.name, value: v});
- });
- //hand off to jQuery.param for proper encoding
- return $.param(a);
-};
-
-/**
- * Returns the value(s) of the element in the matched set. For example, consider the following form:
- *
- * <form><fieldset>
- * <input name="A" type="text" />
- * <input name="A" type="text" />
- * <input name="B" type="checkbox" value="B1" />
- * <input name="B" type="checkbox" value="B2"/>
- * <input name="C" type="radio" value="C1" />
- * <input name="C" type="radio" value="C2" />
- * </fieldset></form>
- *
- * var v = $(':text').fieldValue();
- * // if no values are entered into the text inputs
- * v == ['','']
- * // if values entered into the text inputs are 'foo' and 'bar'
- * v == ['foo','bar']
- *
- * var v = $(':checkbox').fieldValue();
- * // if neither checkbox is checked
- * v === undefined
- * // if both checkboxes are checked
- * v == ['B1', 'B2']
- *
- * var v = $(':radio').fieldValue();
- * // if neither radio is checked
- * v === undefined
- * // if first radio is checked
- * v == ['C1']
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true. If this value is false the value(s)
- * for each element is returned.
- *
- * Note: This method *always* returns an array. If no valid value can be determined the
- * array will be empty, otherwise it will contain one or more values.
- */
-$.fn.fieldValue = function(successful) {
- for (var val=[], i=0, max=this.length; i < max; i++) {
- var el = this[i];
- var v = $.fieldValue(el, successful);
- if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
- continue;
- v.constructor == Array ? $.merge(val, v) : val.push(v);
- }
- return val;
-};
-
-/**
- * Returns the value of the field element.
- */
-$.fieldValue = function(el, successful) {
- var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
- if (typeof successful == 'undefined') successful = true;
-
- if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
- (t == 'checkbox' || t == 'radio') && !el.checked ||
- (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
- tag == 'select' && el.selectedIndex == -1))
- return null;
-
- if (tag == 'select') {
- var index = el.selectedIndex;
- if (index < 0) return null;
- var a = [], ops = el.options;
- var one = (t == 'select-one');
- var max = (one ? index+1 : ops.length);
- for(var i=(one ? index : 0); i < max; i++) {
- var op = ops[i];
- if (op.selected) {
- var v = op.value;
- if (!v) // extra pain for IE...
- v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
- if (one) return v;
- a.push(v);
- }
- }
- return a;
- }
- return el.value;
-};
-
-/**
- * Clears the form data. Takes the following actions on the form's input fields:
- * - input text fields will have their 'value' property set to the empty string
- * - select elements will have their 'selectedIndex' property set to -1
- * - checkbox and radio inputs will have their 'checked' property set to false
- * - inputs of type submit, button, reset, and hidden will *not* be effected
- * - button elements will *not* be effected
- */
-$.fn.clearForm = function() {
- return this.each(function() {
- $('input,select,textarea', this).clearFields();
- });
-};
-
-/**
- * Clears the selected form elements.
- */
-$.fn.clearFields = $.fn.clearInputs = function() {
- return this.each(function() {
- var t = this.type, tag = this.tagName.toLowerCase();
- if (t == 'text' || t == 'password' || tag == 'textarea')
- this.value = '';
- else if (t == 'checkbox' || t == 'radio')
- this.checked = false;
- else if (tag == 'select')
- this.selectedIndex = -1;
- });
-};
-
-/**
- * Resets the form data. Causes all form elements to be reset to their original value.
- */
-$.fn.resetForm = function() {
- return this.each(function() {
- // guard against an input with the name of 'reset'
- // note that IE reports the reset function as an 'object'
- if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
- this.reset();
- });
-};
-
-/**
- * Enables or disables any matching elements.
- */
-$.fn.enable = function(b) {
- if (b == undefined) b = true;
- return this.each(function() {
- this.disabled = !b;
- });
-};
-
-/**
- * Checks/unchecks any matching checkboxes or radio buttons and
- * selects/deselects and matching option elements.
- */
-$.fn.selected = function(select) {
- if (select == undefined) select = true;
- return this.each(function() {
- var t = this.type;
- if (t == 'checkbox' || t == 'radio')
- this.checked = select;
- else if (this.tagName.toLowerCase() == 'option') {
- var $sel = $(this).parent('select');
- if (select && $sel[0] && $sel[0].type == 'select-one') {
- // deselect all other options
- $sel.find('option').selected(false);
- }
- this.selected = select;
- }
- });
-};
-
-// helper fn for console logging
-// set $.fn.ajaxSubmit.debug to true to enable debug logging
-function log() {
- if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
- window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
-};
-
-})(jQuery);
+/*
+ * jQuery Form Plugin
+ * version: 2.17 (06-NOV-2008)
+ * @requires jQuery v1.2.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id$
+ */
+;(function($) {
+
+/*
+ Usage Note:
+ -----------
+ Do not use both ajaxSubmit and ajaxForm on the same form. These
+ functions are intended to be exclusive. Use ajaxSubmit if you want
+ to bind your own submit handler to the form. For example,
+
+ $(document).ready(function() {
+ $('#myForm').bind('submit', function() {
+ $(this).ajaxSubmit({
+ target: '#output'
+ });
+ return false; // <-- important!
+ });
+ });
+
+ Use ajaxForm when you want the plugin to manage all the event binding
+ for you. For example,
+
+ $(document).ready(function() {
+ $('#myForm').ajaxForm({
+ target: '#output'
+ });
+ });
+
+ When using ajaxForm, the ajaxSubmit function will be invoked for you
+ at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+ // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+ if (!this.length) {
+ log('ajaxSubmit: skipping submit process - no element selected');
+ return this;
+ }
+
+ if (typeof options == 'function')
+ options = { success: options };
+
+ options = $.extend({
+ url: this.attr('action') || window.location.toString(),
+ type: this.attr('method') || 'GET'
+ }, options || {});
+
+ // hook for manipulating the form data before it is extracted;
+ // convenient for use with rich editors like tinyMCE or FCKEditor
+ var veto = {};
+ this.trigger('form-pre-serialize', [this, options, veto]);
+ if (veto.veto) {
+ log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+ return this;
+ }
+
+ // provide opportunity to alter form data before it is serialized
+ if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+ log('ajaxSubmit: submit aborted via beforeSerialize callback');
+ return this;
+ }
+
+ var a = this.formToArray(options.semantic);
+ if (options.data) {
+ options.extraData = options.data;
+ for (var n in options.data) {
+ if(options.data[n] instanceof Array) {
+ for (var k in options.data[n])
+ a.push( { name: n, value: options.data[n][k] } )
+ }
+ else
+ a.push( { name: n, value: options.data[n] } );
+ }
+ }
+
+ // give pre-submit callback an opportunity to abort the submit
+ if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+ log('ajaxSubmit: submit aborted via beforeSubmit callback');
+ return this;
+ }
+
+ // fire vetoable 'validate' event
+ this.trigger('form-submit-validate', [a, this, options, veto]);
+ if (veto.veto) {
+ log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+ return this;
+ }
+
+ var q = $.param(a);
+
+ if (options.type.toUpperCase() == 'GET') {
+ options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+ options.data = null; // data is null for 'get'
+ }
+ else
+ options.data = q; // data is the query string for 'post'
+
+ var $form = this, callbacks = [];
+ if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
+ if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+
+ // perform a load on the target only if dataType is not provided
+ if (!options.dataType && options.target) {
+ var oldSuccess = options.success || function(){};
+ callbacks.push(function(data) {
+ $(options.target).html(data).each(oldSuccess, arguments);
+ });
+ }
+ else if (options.success)
+ callbacks.push(options.success);
+
+ options.success = function(data, status) {
+ for (var i=0, max=callbacks.length; i < max; i++)
+ callbacks[i].apply(options, [data, status, $form]);
+ };
+
+ // are there files to upload?
+ var files = $('input:file', this).fieldValue();
+ var found = false;
+ for (var j=0; j < files.length; j++)
+ if (files[j])
+ found = true;
+
+ // options.iframe allows user to force iframe mode
+ if (options.iframe || found) {
+ // hack to fix Safari hang (thanks to Tim Molendijk for this)
+ // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+ if ($.browser.safari && options.closeKeepAlive)
+ $.get(options.closeKeepAlive, fileUpload);
+ else
+ fileUpload();
+ }
+ else
+ $.ajax(options);
+
+ // fire 'notify' event
+ this.trigger('form-submit-notify', [this, options]);
+ return this;
+
+
+ // private function for handling file uploads (hat tip to YAHOO!)
+ function fileUpload() {
+ var form = $form[0];
+
+ if ($(':input[name=submit]', form).length) {
+ alert('Error: Form elements must not be named "submit".');
+ return;
+ }
+
+ var opts = $.extend({}, $.ajaxSettings, options);
+ var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+
+ var id = 'jqFormIO' + (new Date().getTime());
+ var $io = $('<iframe id="' + id + '" name="' + id + '" />');
+ var io = $io[0];
+
+ if ($.browser.msie || $.browser.opera)
+ io.src = 'javascript:false;document.write("");';
+ $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+ var xhr = { // mock object
+ aborted: 0,
+ responseText: null,
+ responseXML: null,
+ status: 0,
+ statusText: 'n/a',
+ getAllResponseHeaders: function() {},
+ getResponseHeader: function() {},
+ setRequestHeader: function() {},
+ abort: function() {
+ this.aborted = 1;
+ $io.attr('src','about:blank'); // abort op in progress
+ }
+ };
+
+ var g = opts.global;
+ // trigger ajax global events so that activity/block indicators work like normal
+ if (g && ! $.active++) $.event.trigger("ajaxStart");
+ if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+ if (s.beforeSend && s.beforeSend(xhr, s) === false) {
+ s.global && jQuery.active--;
+ return;
+ }
+ if (xhr.aborted)
+ return;
+
+ var cbInvoked = 0;
+ var timedOut = 0;
+
+ // add submitting element to data if we know it
+ var sub = form.clk;
+ if (sub) {
+ var n = sub.name;
+ if (n && !sub.disabled) {
+ options.extraData = options.extraData || {};
+ options.extraData[n] = sub.value;
+ if (sub.type == "image") {
+ options.extraData[name+'.x'] = form.clk_x;
+ options.extraData[name+'.y'] = form.clk_y;
+ }
+ }
+ }
+
+ // take a breath so that pending repaints get some cpu time before the upload starts
+ setTimeout(function() {
+ // make sure form attrs are set
+ var t = $form.attr('target'), a = $form.attr('action');
+ $form.attr({
+ target: id,
+ method: 'POST',
+ action: opts.url
+ });
+
+ // ie borks in some cases when setting encoding
+ if (! options.skipEncodingOverride) {
+ $form.attr({
+ encoding: 'multipart/form-data',
+ enctype: 'multipart/form-data'
+ });
+ }
+
+ // support timout
+ if (opts.timeout)
+ setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+ // add "extra" data to form if provided in options
+ var extraInputs = [];
+ try {
+ if (options.extraData)
+ for (var n in options.extraData)
+ extraInputs.push(
+ $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
+ .appendTo(form)[0]);
+
+ // add iframe to doc and submit the form
+ $io.appendTo('body');
+ io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+ form.submit();
+ }
+ finally {
+ // reset attrs and remove "extra" input elements
+ $form.attr('action', a);
+ t ? $form.attr('target', t) : $form.removeAttr('target');
+ $(extraInputs).remove();
+ }
+ }, 10);
+
+ function cb() {
+ if (cbInvoked++) return;
+
+ io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+ var operaHack = 0;
+ var ok = true;
+ try {
+ if (timedOut) throw 'timeout';
+ // extract the server response from the iframe
+ var data, doc;
+
+ doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+
+ if (doc.body == null && !operaHack && $.browser.opera) {
+ // In Opera 9.2.x the iframe DOM is not always traversable when
+ // the onload callback fires so we give Opera 100ms to right itself
+ operaHack = 1;
+ cbInvoked--;
+ setTimeout(cb, 100);
+ return;
+ }
+
+ xhr.responseText = doc.body ? doc.body.innerHTML : null;
+ xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+ xhr.getResponseHeader = function(header){
+ var headers = {'content-type': opts.dataType};
+ return headers[header];
+ };
+
+ if (opts.dataType == 'json' || opts.dataType == 'script') {
+ var ta = doc.getElementsByTagName('textarea')[0];
+ xhr.responseText = ta ? ta.value : xhr.responseText;
+ }
+ else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+ xhr.responseXML = toXml(xhr.responseText);
+ }
+ data = $.httpData(xhr, opts.dataType);
+ }
+ catch(e){
+ ok = false;
+ $.handleError(opts, xhr, 'error', e);
+ }
+
+ // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+ if (ok) {
+ opts.success(data, 'success');
+ if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+ }
+ if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+ if (g && ! --$.active) $.event.trigger("ajaxStop");
+ if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+ // clean up
+ setTimeout(function() {
+ $io.remove();
+ xhr.responseXML = null;
+ }, 100);
+ };
+
+ function toXml(s, doc) {
+ if (window.ActiveXObject) {
+ doc = new ActiveXObject('Microsoft.XMLDOM');
+ doc.async = 'false';
+ doc.loadXML(s);
+ }
+ else
+ doc = (new DOMParser()).parseFromString(s, 'text/xml');
+ return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+ };
+ };
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ * is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ * used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit. ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+ return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
+ $(this).ajaxSubmit(options);
+ return false;
+ }).each(function() {
+ // store options in hash
+ $(":submit,input:image", this).bind('click.form-plugin',function(e) {
+ var form = this.form;
+ form.clk = this;
+ if (this.type == 'image') {
+ if (e.offsetX != undefined) {
+ form.clk_x = e.offsetX;
+ form.clk_y = e.offsetY;
+ } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+ var offset = $(this).offset();
+ form.clk_x = e.pageX - offset.left;
+ form.clk_y = e.pageY - offset.top;
+ } else {
+ form.clk_x = e.pageX - this.offsetLeft;
+ form.clk_y = e.pageY - this.offsetTop;
+ }
+ }
+ // clear form vars
+ setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
+ });
+ });
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+ this.unbind('submit.form-plugin');
+ return this.each(function() {
+ $(":submit,input:image", this).unbind('click.form-plugin');
+ });
+
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property. An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+ var a = [];
+ if (this.length == 0) return a;
+
+ var form = this[0];
+ var els = semantic ? form.getElementsByTagName('*') : form.elements;
+ if (!els) return a;
+ for(var i=0, max=els.length; i < max; i++) {
+ var el = els[i];
+ var n = el.name;
+ if (!n) continue;
+
+ if (semantic && form.clk && el.type == "image") {
+ // handle image inputs on the fly when semantic == true
+ if(!el.disabled && form.clk == el)
+ a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+ continue;
+ }
+
+ var v = $.fieldValue(el, true);
+ if (v && v.constructor == Array) {
+ for(var j=0, jmax=v.length; j < jmax; j++)
+ a.push({name: n, value: v[j]});
+ }
+ else if (v !== null && typeof v != 'undefined')
+ a.push({name: n, value: v});
+ }
+
+ if (!semantic && form.clk) {
+ // input type=='image' are not found in elements array! handle them here
+ var inputs = form.getElementsByTagName("input");
+ for(var i=0, max=inputs.length; i < max; i++) {
+ var input = inputs[i];
+ var n = input.name;
+ if(n && !input.disabled && input.type == "image" && form.clk == input)
+ a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+ }
+ }
+ return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+ //hand off to jQuery.param for proper encoding
+ return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+ var a = [];
+ this.each(function() {
+ var n = this.name;
+ if (!n) return;
+ var v = $.fieldValue(this, successful);
+ if (v && v.constructor == Array) {
+ for (var i=0,max=v.length; i < max; i++)
+ a.push({name: n, value: v[i]});
+ }
+ else if (v !== null && typeof v != 'undefined')
+ a.push({name: this.name, value: v});
+ });
+ //hand off to jQuery.param for proper encoding
+ return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set. For example, consider the following form:
+ *
+ * <form><fieldset>
+ * <input name="A" type="text" />
+ * <input name="A" type="text" />
+ * <input name="B" type="checkbox" value="B1" />
+ * <input name="B" type="checkbox" value="B2"/>
+ * <input name="C" type="radio" value="C1" />
+ * <input name="C" type="radio" value="C2" />
+ * </fieldset></form>
+ *
+ * var v = $(':text').fieldValue();
+ * // if no values are entered into the text inputs
+ * v == ['','']
+ * // if values entered into the text inputs are 'foo' and 'bar'
+ * v == ['foo','bar']
+ *
+ * var v = $(':checkbox').fieldValue();
+ * // if neither checkbox is checked
+ * v === undefined
+ * // if both checkboxes are checked
+ * v == ['B1', 'B2']
+ *
+ * var v = $(':radio').fieldValue();
+ * // if neither radio is checked
+ * v === undefined
+ * // if first radio is checked
+ * v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true. If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array. If no valid value can be determined the
+ * array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+ for (var val=[], i=0, max=this.length; i < max; i++) {
+ var el = this[i];
+ var v = $.fieldValue(el, successful);
+ if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+ continue;
+ v.constructor == Array ? $.merge(val, v) : val.push(v);
+ }
+ return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+ var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+ if (typeof successful == 'undefined') successful = true;
+
+ if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+ (t == 'checkbox' || t == 'radio') && !el.checked ||
+ (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+ tag == 'select' && el.selectedIndex == -1))
+ return null;
+
+ if (tag == 'select') {
+ var index = el.selectedIndex;
+ if (index < 0) return null;
+ var a = [], ops = el.options;
+ var one = (t == 'select-one');
+ var max = (one ? index+1 : ops.length);
+ for(var i=(one ? index : 0); i < max; i++) {
+ var op = ops[i];
+ if (op.selected) {
+ // extra pain for IE...
+ var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
+ if (one) return v;
+ a.push(v);
+ }
+ }
+ return a;
+ }
+ return el.value;
+};
+
+/**
+ * Clears the form data. Takes the following actions on the form's input fields:
+ * - input text fields will have their 'value' property set to the empty string
+ * - select elements will have their 'selectedIndex' property set to -1
+ * - checkbox and radio inputs will have their 'checked' property set to false
+ * - inputs of type submit, button, reset, and hidden will *not* be effected
+ * - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+ return this.each(function() {
+ $('input,select,textarea', this).clearFields();
+ });
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+ return this.each(function() {
+ var t = this.type, tag = this.tagName.toLowerCase();
+ if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea')
+ this.value = '';
+ else if (t == 'checkbox' || t == 'radio')
+ this.checked = false;
+ else if (tag == 'select')
+ this.selectedIndex = -1;
+ });
+};
+
+/**
+ * Resets the form data. Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+ return this.each(function() {
+ // guard against an input with the name of 'reset'
+ // note that IE reports the reset function as an 'object'
+ if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+ this.reset();
+ });
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+ if (b == undefined) b = true;
+ return this.each(function() {
+ this.disabled = !b
+ });
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+ if (select == undefined) select = true;
+ return this.each(function() {
+ var t = this.type;
+ if (t == 'checkbox' || t == 'radio')
+ this.checked = select;
+ else if (this.tagName.toLowerCase() == 'option') {
+ var $sel = $(this).parent('select');
+ if (select && $sel[0] && $sel[0].type == 'select-one') {
+ // deselect all other options
+ $sel.find('option').selected(false);
+ }
+ this.selected = select;
+ }
+ });
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+ if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
+ window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+};
+
+})(jQuery);
diff --git a/js/jquery.js b/js/jquery.js
index 237e1b908..b3b95307a 100644
--- a/js/jquery.js
+++ b/js/jquery.js
@@ -1,5 +1,5 @@
/*!
- * jQuery JavaScript Library v1.4.1
+ * jQuery JavaScript Library v1.4.2
* http://jquery.com/
*
* Copyright 2010, John Resig
@@ -11,7 +11,7 @@
* Copyright 2010, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
*
- * Date: Mon Jan 25 19:43:33 2010 -0500
+ * Date: Sat Feb 13 22:33:48 2010 -0500
*/
(function( window, undefined ) {
@@ -86,6 +86,15 @@ jQuery.fn = jQuery.prototype = {
this.length = 1;
return this;
}
+
+ // The body element only exists once, optimize finding it
+ if ( selector === "body" && !context ) {
+ this.context = document;
+ this[0] = document.body;
+ this.selector = "body";
+ this.length = 1;
+ return this;
+ }
// Handle HTML strings
if ( typeof selector === "string" ) {
@@ -116,7 +125,9 @@ jQuery.fn = jQuery.prototype = {
ret = buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
}
-
+
+ return jQuery.merge( this, selector );
+
// HANDLE: $("#id")
} else {
elem = document.getElementById( match[2] );
@@ -143,6 +154,7 @@ jQuery.fn = jQuery.prototype = {
this.selector = selector;
this.context = document;
selector = document.getElementsByTagName( selector );
+ return jQuery.merge( this, selector );
// HANDLE: $(expr, $(...))
} else if ( !context || context.jquery ) {
@@ -165,16 +177,14 @@ jQuery.fn = jQuery.prototype = {
this.context = selector.context;
}
- return jQuery.isArray( selector ) ?
- this.setArray( selector ) :
- jQuery.makeArray( selector, this );
+ return jQuery.makeArray( selector, this );
},
// Start with an empty selector
selector: "",
// The current version of jQuery being used
- jquery: "1.4.1",
+ jquery: "1.4.2",
// The default length of a jQuery object is 0
length: 0,
@@ -204,7 +214,14 @@ jQuery.fn = jQuery.prototype = {
// (returning the new matched element set)
pushStack: function( elems, name, selector ) {
// Build a new jQuery matched element set
- var ret = jQuery( elems || null );
+ var ret = jQuery();
+
+ if ( jQuery.isArray( elems ) ) {
+ push.apply( ret, elems );
+
+ } else {
+ jQuery.merge( ret, elems );
+ }
// Add the old object onto the stack (as a reference)
ret.prevObject = this;
@@ -221,18 +238,6 @@ jQuery.fn = jQuery.prototype = {
return ret;
},
- // Force the current matched set of elements to become
- // the specified array of elements (destroying the stack in the process)
- // You should use pushStack() in order to do this, but maintain the stack
- setArray: function( elems ) {
- // Resetting the length to 0, then using the native Array push
- // is a super-fast way to populate an object with array-like properties
- this.length = 0;
- push.apply( this, elems );
-
- return this;
- },
-
// Execute a callback for every element in the matched set.
// (You can seed the arguments with an array of args, but this is
// only used internally.)
@@ -492,6 +497,9 @@ jQuery.extend({
if ( typeof data !== "string" || !data ) {
return null;
}
+
+ // Make sure leading/trailing whitespace is removed (IE can't handle it)
+ data = jQuery.trim( data );
// Make sure the incoming data is actual JSON
// Logic borrowed from http://json.org/json2.js
@@ -619,6 +627,7 @@ jQuery.extend({
for ( var l = second.length; j < l; j++ ) {
first[ i++ ] = second[ j ];
}
+
} else {
while ( second[j] !== undefined ) {
first[ i++ ] = second[ j++ ];
@@ -807,7 +816,7 @@ function access( elems, key, value, exec, fn, pass ) {
}
// Getting an attribute
- return length ? fn( elems[0], key ) : null;
+ return length ? fn( elems[0], key ) : undefined;
}
function now() {
@@ -871,7 +880,10 @@ function now() {
// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
+ parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
+
// Will be defined later
+ deleteExpando: true,
checkClone: false,
scriptEval: false,
noCloneEvent: true,
@@ -893,6 +905,15 @@ function now() {
delete window[ id ];
}
+ // Test to see if it's possible to delete an expando from an element
+ // Fails in Internet Explorer
+ try {
+ delete script.test;
+
+ } catch(e) {
+ jQuery.support.deleteExpando = false;
+ }
+
root.removeChild( script );
if ( div.attachEvent && div.fireEvent ) {
@@ -923,6 +944,7 @@ function now() {
document.body.appendChild( div );
jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
document.body.removeChild( div ).style.display = 'none';
+
div = null;
});
@@ -962,7 +984,6 @@ jQuery.props = {
frameborder: "frameBorder"
};
var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
jQuery.extend({
cache: {},
@@ -988,8 +1009,7 @@ jQuery.extend({
var id = elem[ expando ], cache = jQuery.cache, thisCache;
- // Handle the case where there's no name immediately
- if ( !name && !id ) {
+ if ( !id && typeof name === "string" && data === undefined ) {
return null;
}
@@ -1003,17 +1023,16 @@ jQuery.extend({
if ( typeof name === "object" ) {
elem[ expando ] = id;
thisCache = cache[ id ] = jQuery.extend(true, {}, name);
- } else if ( cache[ id ] ) {
- thisCache = cache[ id ];
- } else if ( typeof data === "undefined" ) {
- thisCache = emptyObject;
- } else {
- thisCache = cache[ id ] = {};
+
+ } else if ( !cache[ id ] ) {
+ elem[ expando ] = id;
+ cache[ id ] = {};
}
+ thisCache = cache[ id ];
+
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {
- elem[ expando ] = id;
thisCache[ name ] = data;
}
@@ -1045,15 +1064,11 @@ jQuery.extend({
// Otherwise, we want to remove all of the element's data
} else {
- // Clean up the element expando
- try {
- delete elem[ expando ];
- } catch( e ) {
- // IE has trouble directly removing the expando
- // but it's ok with using removeAttribute
- if ( elem.removeAttribute ) {
- elem.removeAttribute( expando );
- }
+ if ( jQuery.support.deleteExpando ) {
+ delete elem[ jQuery.expando ];
+
+ } else if ( elem.removeAttribute ) {
+ elem.removeAttribute( jQuery.expando );
}
// Completely remove the data cache
@@ -1230,12 +1245,13 @@ jQuery.fn.extend({
elem.className = value;
} else {
- var className = " " + elem.className + " ";
+ var className = " " + elem.className + " ", setClass = elem.className;
for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
- elem.className += " " + classNames[c];
+ setClass += " " + classNames[c];
}
}
+ elem.className = jQuery.trim( setClass );
}
}
}
@@ -1264,7 +1280,7 @@ jQuery.fn.extend({
for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
className = className.replace(" " + classNames[c] + " ", " ");
}
- elem.className = className.substring(1, className.length - 1);
+ elem.className = jQuery.trim( className );
} else {
elem.className = "";
@@ -1520,15 +1536,16 @@ jQuery.extend({
}
// elem is actually elem.style ... set the style
- // Using attr for specific style information is now deprecated. Use style insead.
+ // Using attr for specific style information is now deprecated. Use style instead.
return jQuery.style( elem, name, value );
}
});
-var fcleanup = function( nm ) {
- return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
- return "\\" + ch;
- });
-};
+var rnamespaces = /\.(.*)$/,
+ fcleanup = function( nm ) {
+ return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
+ return "\\" + ch;
+ });
+ };
/*
* A number of helper functions used for managing events.
@@ -1550,107 +1567,104 @@ jQuery.event = {
elem = window;
}
+ var handleObjIn, handleObj;
+
+ if ( handler.handler ) {
+ handleObjIn = handler;
+ handler = handleObjIn.handler;
+ }
+
// Make sure that the function being executed has a unique ID
if ( !handler.guid ) {
handler.guid = jQuery.guid++;
}
- // if data is passed, bind to handler
- if ( data !== undefined ) {
- // Create temporary function pointer to original handler
- var fn = handler;
-
- // Create unique handler function, wrapped around original handler
- handler = jQuery.proxy( fn );
+ // Init the element's event structure
+ var elemData = jQuery.data( elem );
- // Store data in unique handler
- handler.data = data;
+ // If no elemData is found then we must be trying to bind to one of the
+ // banned noData elements
+ if ( !elemData ) {
+ return;
}
- // Init the element's event structure
- var events = jQuery.data( elem, "events" ) || jQuery.data( elem, "events", {} ),
- handle = jQuery.data( elem, "handle" ), eventHandle;
+ var events = elemData.events = elemData.events || {},
+ eventHandle = elemData.handle, eventHandle;
- if ( !handle ) {
- eventHandle = function() {
+ if ( !eventHandle ) {
+ elemData.handle = eventHandle = function() {
// Handle the second event of a trigger and when
// an event is called after a page has unloaded
return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
jQuery.event.handle.apply( eventHandle.elem, arguments ) :
undefined;
};
-
- handle = jQuery.data( elem, "handle", eventHandle );
- }
-
- // If no handle is found then we must be trying to bind to one of the
- // banned noData elements
- if ( !handle ) {
- return;
}
// Add elem as a property of the handle function
- // This is to prevent a memory leak with non-native
- // event in IE.
- handle.elem = elem;
+ // This is to prevent a memory leak with non-native events in IE.
+ eventHandle.elem = elem;
// Handle multiple events separated by a space
// jQuery(...).bind("mouseover mouseout", fn);
- types = types.split( /\s+/ );
+ types = types.split(" ");
- var type, i = 0;
+ var type, i = 0, namespaces;
while ( (type = types[ i++ ]) ) {
- // Namespaced event handlers
- var namespaces = type.split(".");
- type = namespaces.shift();
+ handleObj = handleObjIn ?
+ jQuery.extend({}, handleObjIn) :
+ { handler: handler, data: data };
- if ( i > 1 ) {
- handler = jQuery.proxy( handler );
+ // Namespaced event handlers
+ if ( type.indexOf(".") > -1 ) {
+ namespaces = type.split(".");
+ type = namespaces.shift();
+ handleObj.namespace = namespaces.slice(0).sort().join(".");
- if ( data !== undefined ) {
- handler.data = data;
- }
+ } else {
+ namespaces = [];
+ handleObj.namespace = "";
}
- handler.type = namespaces.slice(0).sort().join(".");
+ handleObj.type = type;
+ handleObj.guid = handler.guid;
// Get the current list of functions bound to this event
var handlers = events[ type ],
- special = this.special[ type ] || {};
+ special = jQuery.event.special[ type ] || {};
// Init the event handler queue
if ( !handlers ) {
- handlers = events[ type ] = {};
+ handlers = events[ type ] = [];
// Check for a special event handler
// Only use addEventListener/attachEvent if the special
// events handler returns false
- if ( !special.setup || special.setup.call( elem, data, namespaces, handler) === false ) {
+ if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
// Bind the global event handler to the element
if ( elem.addEventListener ) {
- elem.addEventListener( type, handle, false );
+ elem.addEventListener( type, eventHandle, false );
+
} else if ( elem.attachEvent ) {
- elem.attachEvent( "on" + type, handle );
+ elem.attachEvent( "on" + type, eventHandle );
}
}
}
if ( special.add ) {
- var modifiedHandler = special.add.call( elem, handler, data, namespaces, handlers );
- if ( modifiedHandler && jQuery.isFunction( modifiedHandler ) ) {
- modifiedHandler.guid = modifiedHandler.guid || handler.guid;
- modifiedHandler.data = modifiedHandler.data || handler.data;
- modifiedHandler.type = modifiedHandler.type || handler.type;
- handler = modifiedHandler;
- }
- }
-
+ special.add.call( elem, handleObj );
+
+ if ( !handleObj.handler.guid ) {
+ handleObj.handler.guid = handler.guid;
+ }
+ }
+
// Add the function to the element's handler list
- handlers[ handler.guid ] = handler;
+ handlers.push( handleObj );
// Keep track of which events have been used, for global triggering
- this.global[ type ] = true;
+ jQuery.event.global[ type ] = true;
}
// Nullify elem to prevent memory leaks in IE
@@ -1660,90 +1674,121 @@ jQuery.event = {
global: {},
// Detach an event or set of events from an element
- remove: function( elem, types, handler ) {
+ remove: function( elem, types, handler, pos ) {
// don't do events on text and comment nodes
if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
return;
}
- var events = jQuery.data( elem, "events" ), ret, type, fn;
+ var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+ elemData = jQuery.data( elem ),
+ events = elemData && elemData.events;
- if ( events ) {
- // Unbind all events for the element
- if ( types === undefined || (typeof types === "string" && types.charAt(0) === ".") ) {
- for ( type in events ) {
- this.remove( elem, type + (types || "") );
- }
- } else {
- // types is actually an event object here
- if ( types.type ) {
- handler = types.handler;
- types = types.type;
+ if ( !elemData || !events ) {
+ return;
+ }
+
+ // types is actually an event object here
+ if ( types && types.type ) {
+ handler = types.handler;
+ types = types.type;
+ }
+
+ // Unbind all events for the element
+ if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+ types = types || "";
+
+ for ( type in events ) {
+ jQuery.event.remove( elem, type + types );
+ }
+
+ return;
+ }
+
+ // Handle multiple events separated by a space
+ // jQuery(...).unbind("mouseover mouseout", fn);
+ types = types.split(" ");
+
+ while ( (type = types[ i++ ]) ) {
+ origType = type;
+ handleObj = null;
+ all = type.indexOf(".") < 0;
+ namespaces = [];
+
+ if ( !all ) {
+ // Namespaced event handlers
+ namespaces = type.split(".");
+ type = namespaces.shift();
+
+ namespace = new RegExp("(^|\\.)" +
+ jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
+ }
+
+ eventType = events[ type ];
+
+ if ( !eventType ) {
+ continue;
+ }
+
+ if ( !handler ) {
+ for ( var j = 0; j < eventType.length; j++ ) {
+ handleObj = eventType[ j ];
+
+ if ( all || namespace.test( handleObj.namespace ) ) {
+ jQuery.event.remove( elem, origType, handleObj.handler, j );
+ eventType.splice( j--, 1 );
+ }
}
- // Handle multiple events separated by a space
- // jQuery(...).unbind("mouseover mouseout", fn);
- types = types.split(/\s+/);
- var i = 0;
- while ( (type = types[ i++ ]) ) {
- // Namespaced event handlers
- var namespaces = type.split(".");
- type = namespaces.shift();
- var all = !namespaces.length,
- cleaned = jQuery.map( namespaces.slice(0).sort(), fcleanup ),
- namespace = new RegExp("(^|\\.)" + cleaned.join("\\.(?:.*\\.)?") + "(\\.|$)"),
- special = this.special[ type ] || {};
-
- if ( events[ type ] ) {
- // remove the given handler for the given type
- if ( handler ) {
- fn = events[ type ][ handler.guid ];
- delete events[ type ][ handler.guid ];
-
- // remove all handlers for the given type
- } else {
- for ( var handle in events[ type ] ) {
- // Handle the removal of namespaced events
- if ( all || namespace.test( events[ type ][ handle ].type ) ) {
- delete events[ type ][ handle ];
- }
- }
+ continue;
+ }
+
+ special = jQuery.event.special[ type ] || {};
+
+ for ( var j = pos || 0; j < eventType.length; j++ ) {
+ handleObj = eventType[ j ];
+
+ if ( handler.guid === handleObj.guid ) {
+ // remove the given handler for the given type
+ if ( all || namespace.test( handleObj.namespace ) ) {
+ if ( pos == null ) {
+ eventType.splice( j--, 1 );
}
if ( special.remove ) {
- special.remove.call( elem, namespaces, fn);
+ special.remove.call( elem, handleObj );
}
+ }
- // remove generic event handler if no more handlers exist
- for ( ret in events[ type ] ) {
- break;
- }
- if ( !ret ) {
- if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
- if ( elem.removeEventListener ) {
- elem.removeEventListener( type, jQuery.data( elem, "handle" ), false );
- } else if ( elem.detachEvent ) {
- elem.detachEvent( "on" + type, jQuery.data( elem, "handle" ) );
- }
- }
- ret = null;
- delete events[ type ];
- }
+ if ( pos != null ) {
+ break;
}
}
}
- // Remove the expando if it's no longer used
- for ( ret in events ) {
- break;
- }
- if ( !ret ) {
- var handle = jQuery.data( elem, "handle" );
- if ( handle ) {
- handle.elem = null;
+ // remove generic event handler if no more handlers exist
+ if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+ if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+ removeEvent( elem, type, elemData.handle );
}
- jQuery.removeData( elem, "events" );
- jQuery.removeData( elem, "handle" );
+
+ ret = null;
+ delete events[ type ];
+ }
+ }
+
+ // Remove the expando if it's no longer used
+ if ( jQuery.isEmptyObject( events ) ) {
+ var handle = elemData.handle;
+ if ( handle ) {
+ handle.elem = null;
+ }
+
+ delete elemData.events;
+ delete elemData.handle;
+
+ if ( jQuery.isEmptyObject( elemData ) ) {
+ jQuery.removeData( elem );
}
}
},
@@ -1774,7 +1819,7 @@ jQuery.event = {
event.stopPropagation();
// Only trigger if we've ever bound an event for it
- if ( this.global[ type ] ) {
+ if ( jQuery.event.global[ type ] ) {
jQuery.each( jQuery.cache, function() {
if ( this.events && this.events[type] ) {
jQuery.event.trigger( event, data, this.handle.elem );
@@ -1825,9 +1870,12 @@ jQuery.event = {
} else if ( !event.isDefaultPrevented() ) {
var target = event.target, old,
- isClick = jQuery.nodeName(target, "a") && type === "click";
+ isClick = jQuery.nodeName(target, "a") && type === "click",
+ special = jQuery.event.special[ type ] || {};
+
+ if ( (!special._default || special._default.call( elem, event ) === false) &&
+ !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
- if ( !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
try {
if ( target[ type ] ) {
// Make sure that we don't accidentally re-trigger the onFOO events
@@ -1837,7 +1885,7 @@ jQuery.event = {
target[ "on" + type ] = null;
}
- this.triggered = true;
+ jQuery.event.triggered = true;
target[ type ]();
}
@@ -1848,53 +1896,57 @@ jQuery.event = {
target[ "on" + type ] = old;
}
- this.triggered = false;
+ jQuery.event.triggered = false;
}
}
},
handle: function( event ) {
- // returned undefined or false
- var all, handlers;
+ var all, handlers, namespaces, namespace, events;
event = arguments[0] = jQuery.event.fix( event || window.event );
event.currentTarget = this;
// Namespaced event handlers
- var namespaces = event.type.split(".");
- event.type = namespaces.shift();
+ all = event.type.indexOf(".") < 0 && !event.exclusive;
- // Cache this now, all = true means, any handler
- all = !namespaces.length && !event.exclusive;
-
- var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+ if ( !all ) {
+ namespaces = event.type.split(".");
+ event.type = namespaces.shift();
+ namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+ }
- handlers = ( jQuery.data(this, "events") || {} )[ event.type ];
+ var events = jQuery.data(this, "events"), handlers = events[ event.type ];
- for ( var j in handlers ) {
- var handler = handlers[ j ];
+ if ( events && handlers ) {
+ // Clone the handlers to prevent manipulation
+ handlers = handlers.slice(0);
- // Filter the functions by class
- if ( all || namespace.test(handler.type) ) {
- // Pass in a reference to the handler function itself
- // So that we can later remove it
- event.handler = handler;
- event.data = handler.data;
+ for ( var j = 0, l = handlers.length; j < l; j++ ) {
+ var handleObj = handlers[ j ];
- var ret = handler.apply( this, arguments );
+ // Filter the functions by class
+ if ( all || namespace.test( handleObj.namespace ) ) {
+ // Pass in a reference to the handler function itself
+ // So that we can later remove it
+ event.handler = handleObj.handler;
+ event.data = handleObj.data;
+ event.handleObj = handleObj;
+
+ var ret = handleObj.handler.apply( this, arguments );
- if ( ret !== undefined ) {
- event.result = ret;
- if ( ret === false ) {
- event.preventDefault();
- event.stopPropagation();
+ if ( ret !== undefined ) {
+ event.result = ret;
+ if ( ret === false ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
}
- }
- if ( event.isImmediatePropagationStopped() ) {
- break;
+ if ( event.isImmediatePropagationStopped() ) {
+ break;
+ }
}
-
}
}
@@ -1973,44 +2025,39 @@ jQuery.event = {
},
live: {
- add: function( proxy, data, namespaces, live ) {
- jQuery.extend( proxy, data || {} );
-
- proxy.guid += data.selector + data.live;
- data.liveProxy = proxy;
-
- jQuery.event.add( this, data.live, liveHandler, data );
-
+ add: function( handleObj ) {
+ jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) );
},
- remove: function( namespaces ) {
- if ( namespaces.length ) {
- var remove = 0, name = new RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)");
-
- jQuery.each( (jQuery.data(this, "events").live || {}), function() {
- if ( name.test(this.type) ) {
- remove++;
- }
- });
-
- if ( remove < 1 ) {
- jQuery.event.remove( this, namespaces[0], liveHandler );
+ remove: function( handleObj ) {
+ var remove = true,
+ type = handleObj.origType.replace(rnamespaces, "");
+
+ jQuery.each( jQuery.data(this, "events").live || [], function() {
+ if ( type === this.origType.replace(rnamespaces, "") ) {
+ remove = false;
+ return false;
}
+ });
+
+ if ( remove ) {
+ jQuery.event.remove( this, handleObj.origType, liveHandler );
}
- },
- special: {}
+ }
+
},
+
beforeunload: {
- setup: function( data, namespaces, fn ) {
+ setup: function( data, namespaces, eventHandle ) {
// We only want to do this special case on windows
if ( this.setInterval ) {
- this.onbeforeunload = fn;
+ this.onbeforeunload = eventHandle;
}
return false;
},
- teardown: function( namespaces, fn ) {
- if ( this.onbeforeunload === fn ) {
+ teardown: function( namespaces, eventHandle ) {
+ if ( this.onbeforeunload === eventHandle ) {
this.onbeforeunload = null;
}
}
@@ -2018,6 +2065,14 @@ jQuery.event = {
}
};
+var removeEvent = document.removeEventListener ?
+ function( elem, type, handle ) {
+ elem.removeEventListener( type, handle, false );
+ } :
+ function( elem, type, handle ) {
+ elem.detachEvent( "on" + type, handle );
+ };
+
jQuery.Event = function( src ) {
// Allow instantiation without the 'new' keyword
if ( !this.preventDefault ) {
@@ -2095,27 +2150,24 @@ var withinElement = function( event ) {
// Check if mouse(over|out) are still within the same parent element
var parent = event.relatedTarget;
- // Traverse up the tree
- while ( parent && parent !== this ) {
- // Firefox sometimes assigns relatedTarget a XUL element
- // which we cannot access the parentNode property of
- try {
+ // Firefox sometimes assigns relatedTarget a XUL element
+ // which we cannot access the parentNode property of
+ try {
+ // Traverse up the tree
+ while ( parent && parent !== this ) {
parent = parent.parentNode;
-
- // assuming we've left the element since we most likely mousedover a xul element
- } catch(e) {
- break;
}
- }
- if ( parent !== this ) {
- // set the correct event type
- event.type = event.data;
+ if ( parent !== this ) {
+ // set the correct event type
+ event.type = event.data;
- // handle event if we actually just moused on to a non sub-element
- jQuery.event.handle.apply( this, arguments );
- }
+ // handle event if we actually just moused on to a non sub-element
+ jQuery.event.handle.apply( this, arguments );
+ }
+ // assuming we've left the element since we most likely mousedover a xul element
+ } catch(e) { }
},
// In case of event delegation, we only need to rename the event.type,
@@ -2143,64 +2195,65 @@ jQuery.each({
// submit delegation
if ( !jQuery.support.submitBubbles ) {
-jQuery.event.special.submit = {
- setup: function( data, namespaces, fn ) {
- if ( this.nodeName.toLowerCase() !== "form" ) {
- jQuery.event.add(this, "click.specialSubmit." + fn.guid, function( e ) {
- var elem = e.target, type = elem.type;
+ jQuery.event.special.submit = {
+ setup: function( data, namespaces ) {
+ if ( this.nodeName.toLowerCase() !== "form" ) {
+ jQuery.event.add(this, "click.specialSubmit", function( e ) {
+ var elem = e.target, type = elem.type;
- if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
- return trigger( "submit", this, arguments );
- }
- });
+ if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+ return trigger( "submit", this, arguments );
+ }
+ });
- jQuery.event.add(this, "keypress.specialSubmit." + fn.guid, function( e ) {
- var elem = e.target, type = elem.type;
+ jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+ var elem = e.target, type = elem.type;
- if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
- return trigger( "submit", this, arguments );
- }
- });
+ if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+ return trigger( "submit", this, arguments );
+ }
+ });
- } else {
- return false;
- }
- },
+ } else {
+ return false;
+ }
+ },
- remove: function( namespaces, fn ) {
- jQuery.event.remove( this, "click.specialSubmit" + (fn ? "."+fn.guid : "") );
- jQuery.event.remove( this, "keypress.specialSubmit" + (fn ? "."+fn.guid : "") );
- }
-};
+ teardown: function( namespaces ) {
+ jQuery.event.remove( this, ".specialSubmit" );
+ }
+ };
}
// change delegation, happens here so we have bind.
if ( !jQuery.support.changeBubbles ) {
-var formElems = /textarea|input|select/i;
+ var formElems = /textarea|input|select/i,
-function getVal( elem ) {
- var type = elem.type, val = elem.value;
+ changeFilters,
- if ( type === "radio" || type === "checkbox" ) {
- val = elem.checked;
+ getVal = function( elem ) {
+ var type = elem.type, val = elem.value;
- } else if ( type === "select-multiple" ) {
- val = elem.selectedIndex > -1 ?
- jQuery.map( elem.options, function( elem ) {
- return elem.selected;
- }).join("-") :
- "";
+ if ( type === "radio" || type === "checkbox" ) {
+ val = elem.checked;
- } else if ( elem.nodeName.toLowerCase() === "select" ) {
- val = elem.selectedIndex;
- }
+ } else if ( type === "select-multiple" ) {
+ val = elem.selectedIndex > -1 ?
+ jQuery.map( elem.options, function( elem ) {
+ return elem.selected;
+ }).join("-") :
+ "";
- return val;
-}
+ } else if ( elem.nodeName.toLowerCase() === "select" ) {
+ val = elem.selectedIndex;
+ }
+
+ return val;
+ },
-function testChange( e ) {
+ testChange = function testChange( e ) {
var elem = e.target, data, val;
if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
@@ -2223,61 +2276,61 @@ function testChange( e ) {
e.type = "change";
return jQuery.event.trigger( e, arguments[1], elem );
}
-}
+ };
-jQuery.event.special.change = {
- filters: {
- focusout: testChange,
+ jQuery.event.special.change = {
+ filters: {
+ focusout: testChange,
- click: function( e ) {
- var elem = e.target, type = elem.type;
+ click: function( e ) {
+ var elem = e.target, type = elem.type;
- if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
- return testChange.call( this, e );
- }
- },
+ if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+ return testChange.call( this, e );
+ }
+ },
+
+ // Change has to be called before submit
+ // Keydown will be called before keypress, which is used in submit-event delegation
+ keydown: function( e ) {
+ var elem = e.target, type = elem.type;
- // Change has to be called before submit
- // Keydown will be called before keypress, which is used in submit-event delegation
- keydown: function( e ) {
- var elem = e.target, type = elem.type;
+ if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+ (e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+ type === "select-multiple" ) {
+ return testChange.call( this, e );
+ }
+ },
- if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
- (e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
- type === "select-multiple" ) {
- return testChange.call( this, e );
+ // Beforeactivate happens also before the previous element is blurred
+ // with this event you can't trigger a change event, but you can store
+ // information/focus[in] is not needed anymore
+ beforeactivate: function( e ) {
+ var elem = e.target;
+ jQuery.data( elem, "_change_data", getVal(elem) );
}
},
- // Beforeactivate happens also before the previous element is blurred
- // with this event you can't trigger a change event, but you can store
- // information/focus[in] is not needed anymore
- beforeactivate: function( e ) {
- var elem = e.target;
+ setup: function( data, namespaces ) {
+ if ( this.type === "file" ) {
+ return false;
+ }
- if ( elem.nodeName.toLowerCase() === "input" && elem.type === "radio" ) {
- jQuery.data( elem, "_change_data", getVal(elem) );
+ for ( var type in changeFilters ) {
+ jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
}
- }
- },
- setup: function( data, namespaces, fn ) {
- for ( var type in changeFilters ) {
- jQuery.event.add( this, type + ".specialChange." + fn.guid, changeFilters[type] );
- }
- return formElems.test( this.nodeName );
- },
- remove: function( namespaces, fn ) {
- for ( var type in changeFilters ) {
- jQuery.event.remove( this, type + ".specialChange" + (fn ? "."+fn.guid : ""), changeFilters[type] );
- }
+ return formElems.test( this.nodeName );
+ },
- return formElems.test( this.nodeName );
- }
-};
+ teardown: function( namespaces ) {
+ jQuery.event.remove( this, ".specialChange" );
-var changeFilters = jQuery.event.special.change.filters;
+ return formElems.test( this.nodeName );
+ }
+ };
+ changeFilters = jQuery.event.special.change.filters;
}
function trigger( type, elem, args ) {
@@ -2325,11 +2378,16 @@ jQuery.each(["bind", "one"], function( i, name ) {
return fn.apply( this, arguments );
}) : fn;
- return type === "unload" && name !== "one" ?
- this.one( type, data, fn ) :
- this.each(function() {
- jQuery.event.add( this, type, handler, data );
- });
+ if ( type === "unload" && name !== "one" ) {
+ this.one( type, data, fn );
+
+ } else {
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ jQuery.event.add( this[i], type, handler, data );
+ }
+ }
+
+ return this;
};
});
@@ -2340,13 +2398,29 @@ jQuery.fn.extend({
for ( var key in type ) {
this.unbind(key, type[key]);
}
- return this;
+
+ } else {
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ jQuery.event.remove( this[i], type, fn );
+ }
}
- return this.each(function() {
- jQuery.event.remove( this, type, fn );
- });
+ return this;
+ },
+
+ delegate: function( selector, types, data, fn ) {
+ return this.live( types, data, fn, selector );
+ },
+
+ undelegate: function( selector, types, fn ) {
+ if ( arguments.length === 0 ) {
+ return this.unbind( "live" );
+
+ } else {
+ return this.die( types, null, fn, selector );
+ }
},
+
trigger: function( type, data ) {
return this.each(function() {
jQuery.event.trigger( type, data, this );
@@ -2390,32 +2464,60 @@ jQuery.fn.extend({
}
});
+var liveMap = {
+ focus: "focusin",
+ blur: "focusout",
+ mouseenter: "mouseover",
+ mouseleave: "mouseout"
+};
+
jQuery.each(["live", "die"], function( i, name ) {
- jQuery.fn[ name ] = function( types, data, fn ) {
- var type, i = 0;
+ jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+ var type, i = 0, match, namespaces, preType,
+ selector = origSelector || this.selector,
+ context = origSelector ? this : jQuery( this.context );
if ( jQuery.isFunction( data ) ) {
fn = data;
data = undefined;
}
- types = (types || "").split( /\s+/ );
+ types = (types || "").split(" ");
while ( (type = types[ i++ ]) != null ) {
- type = type === "focus" ? "focusin" : // focus --> focusin
- type === "blur" ? "focusout" : // blur --> focusout
- type === "hover" ? types.push("mouseleave") && "mouseenter" : // hover support
- type;
-
+ match = rnamespaces.exec( type );
+ namespaces = "";
+
+ if ( match ) {
+ namespaces = match[0];
+ type = type.replace( rnamespaces, "" );
+ }
+
+ if ( type === "hover" ) {
+ types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+ continue;
+ }
+
+ preType = type;
+
+ if ( type === "focus" || type === "blur" ) {
+ types.push( liveMap[ type ] + namespaces );
+ type = type + namespaces;
+
+ } else {
+ type = (liveMap[ type ] || type) + namespaces;
+ }
+
if ( name === "live" ) {
// bind live handler
- jQuery( this.context ).bind( liveConvert( type, this.selector ), {
- data: data, selector: this.selector, live: type
- }, fn );
+ context.each(function(){
+ jQuery.event.add( this, liveConvert( type, selector ),
+ { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+ });
} else {
// unbind live handler
- jQuery( this.context ).unbind( liveConvert( type, this.selector ), fn ? { guid: fn.guid + this.selector + type } : null );
+ context.unbind( liveConvert( type, selector ), fn );
}
}
@@ -2425,45 +2527,46 @@ jQuery.each(["live", "die"], function( i, name ) {
function liveHandler( event ) {
var stop, elems = [], selectors = [], args = arguments,
- related, match, fn, elem, j, i, l, data,
- live = jQuery.extend({}, jQuery.data( this, "events" ).live);
+ related, match, handleObj, elem, j, i, l, data,
+ events = jQuery.data( this, "events" );
// Make sure we avoid non-left-click bubbling in Firefox (#3861)
- if ( event.button && event.type === "click" ) {
+ if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
return;
}
- for ( j in live ) {
- fn = live[j];
- if ( fn.live === event.type ||
- fn.altLive && jQuery.inArray(event.type, fn.altLive) > -1 ) {
+ event.liveFired = this;
+
+ var live = events.live.slice(0);
+
+ for ( j = 0; j < live.length; j++ ) {
+ handleObj = live[j];
+
+ if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+ selectors.push( handleObj.selector );
- data = fn.data;
- if ( !(data.beforeFilter && data.beforeFilter[event.type] &&
- !data.beforeFilter[event.type](event)) ) {
- selectors.push( fn.selector );
- }
} else {
- delete live[j];
+ live.splice( j--, 1 );
}
}
match = jQuery( event.target ).closest( selectors, event.currentTarget );
for ( i = 0, l = match.length; i < l; i++ ) {
- for ( j in live ) {
- fn = live[j];
- elem = match[i].elem;
- related = null;
+ for ( j = 0; j < live.length; j++ ) {
+ handleObj = live[j];
+
+ if ( match[i].selector === handleObj.selector ) {
+ elem = match[i].elem;
+ related = null;
- if ( match[i].selector === fn.selector ) {
// Those two events require additional checking
- if ( fn.live === "mouseenter" || fn.live === "mouseleave" ) {
- related = jQuery( event.relatedTarget ).closest( fn.selector )[0];
+ if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+ related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
}
if ( !related || related !== elem ) {
- elems.push({ elem: elem, fn: fn });
+ elems.push({ elem: elem, handleObj: handleObj });
}
}
}
@@ -2472,8 +2575,10 @@ function liveHandler( event ) {
for ( i = 0, l = elems.length; i < l; i++ ) {
match = elems[i];
event.currentTarget = match.elem;
- event.data = match.fn.data;
- if ( match.fn.apply( match.elem, args ) === false ) {
+ event.data = match.handleObj.data;
+ event.handleObj = match.handleObj;
+
+ if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
stop = false;
break;
}
@@ -2483,7 +2588,7 @@ function liveHandler( event ) {
}
function liveConvert( type, selector ) {
- return "live." + (type ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
+ return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
}
jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
@@ -3228,8 +3333,10 @@ var makeArray = function(array, results) {
// Perform a simple check to determine if the browser is capable of
// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
try {
- Array.prototype.slice.call( document.documentElement.childNodes, 0 );
+ Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
// Provide a fallback method if it does not work
} catch(e){
@@ -3533,7 +3640,7 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
}
var contains = document.compareDocumentPosition ? function(a, b){
- return a.compareDocumentPosition(b) & 16;
+ return !!(a.compareDocumentPosition(b) & 16);
} : function(a, b){
return a !== b && (a.contains ? a.contains(b) : true);
};
@@ -3570,7 +3677,7 @@ jQuery.find = Sizzle;
jQuery.expr = Sizzle.selectors;
jQuery.expr[":"] = jQuery.expr.filters;
jQuery.unique = Sizzle.uniqueSort;
-jQuery.getText = getText;
+jQuery.text = getText;
jQuery.isXMLDoc = isXML;
jQuery.contains = contains;
@@ -3856,7 +3963,8 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
rtagName = /<([\w:]+)/,
rtbody = /<tbody/i,
- rhtml = /<|&\w+;/,
+ rhtml = /<|&#?\w+;/,
+ rnocache = /<script|<object|<embed|<option|<style/i,
rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, // checked="checked" or checked (html5)
fcloseTag = function( all, front, tag ) {
return rselfClosing.test( tag ) ?
@@ -3896,7 +4004,7 @@ jQuery.fn.extend({
return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
}
- return jQuery.getText( this );
+ return jQuery.text( this );
},
wrapAll: function( html ) {
@@ -4000,6 +4108,40 @@ jQuery.fn.extend({
return set;
}
},
+
+ // keepData is for internal use only--do not document
+ remove: function( selector, keepData ) {
+ for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+ if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+ if ( !keepData && elem.nodeType === 1 ) {
+ jQuery.cleanData( elem.getElementsByTagName("*") );
+ jQuery.cleanData( [ elem ] );
+ }
+
+ if ( elem.parentNode ) {
+ elem.parentNode.removeChild( elem );
+ }
+ }
+ }
+
+ return this;
+ },
+
+ empty: function() {
+ for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+ // Remove element nodes and prevent memory leaks
+ if ( elem.nodeType === 1 ) {
+ jQuery.cleanData( elem.getElementsByTagName("*") );
+ }
+
+ // Remove any remaining nodes
+ while ( elem.firstChild ) {
+ elem.removeChild( elem.firstChild );
+ }
+ }
+
+ return this;
+ },
clone: function( events ) {
// Do the clone
@@ -4021,6 +4163,8 @@ jQuery.fn.extend({
}
return jQuery.clean([html.replace(rinlinejQuery, "")
+ // Handle the case in IE 8 where action=/test/> self-closes a tag
+ .replace(/=([^="'>\s]+\/)>/g, '="$1">')
.replace(rleadingWhitespace, "")], ownerDocument)[0];
} else {
return this.cloneNode(true);
@@ -4044,7 +4188,7 @@ jQuery.fn.extend({
null;
// See if we can take a shortcut and just use innerHTML
- } else if ( typeof value === "string" && !/<script/i.test( value ) &&
+ } else if ( typeof value === "string" && !rnocache.test( value ) &&
(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
@@ -4083,16 +4227,17 @@ jQuery.fn.extend({
if ( this[0] && this[0].parentNode ) {
// Make sure that the elements are removed from the DOM before they are inserted
// this can help fix replacing a parent with child elements
- if ( !jQuery.isFunction( value ) ) {
- value = jQuery( value ).detach();
-
- } else {
+ if ( jQuery.isFunction( value ) ) {
return this.each(function(i) {
var self = jQuery(this), old = self.html();
self.replaceWith( value.call( this, i, old ) );
});
}
+ if ( typeof value !== "string" ) {
+ value = jQuery(value).detach();
+ }
+
return this.each(function() {
var next = this.nextSibling, parent = this.parentNode;
@@ -4114,7 +4259,7 @@ jQuery.fn.extend({
},
domManip: function( args, table, callback ) {
- var results, first, value = args[0], scripts = [];
+ var results, first, value = args[0], scripts = [], fragment, parent;
// We can't cloneNode fragments that contain checked, in WebKit
if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
@@ -4132,14 +4277,23 @@ jQuery.fn.extend({
}
if ( this[0] ) {
+ parent = value && value.parentNode;
+
// If we're in a fragment, just use that instead of building a new one
- if ( args[0] && args[0].parentNode && args[0].parentNode.nodeType === 11 ) {
- results = { fragment: args[0].parentNode };
+ if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+ results = { fragment: parent };
+
} else {
results = buildFragment( args, this, scripts );
}
-
- first = results.fragment.firstChild;
+
+ fragment = results.fragment;
+
+ if ( fragment.childNodes.length === 1 ) {
+ first = fragment = fragment.firstChild;
+ } else {
+ first = fragment.firstChild;
+ }
if ( first ) {
table = table && jQuery.nodeName( first, "tr" );
@@ -4149,14 +4303,14 @@ jQuery.fn.extend({
table ?
root(this[i], first) :
this[i],
- results.cacheable || this.length > 1 || i > 0 ?
- results.fragment.cloneNode(true) :
- results.fragment
+ i > 0 || results.cacheable || this.length > 1 ?
+ fragment.cloneNode(true) :
+ fragment
);
}
}
- if ( scripts ) {
+ if ( scripts.length ) {
jQuery.each( scripts, evalScript );
}
}
@@ -4196,10 +4350,16 @@ function cloneCopyEvent(orig, ret) {
}
function buildFragment( args, nodes, scripts ) {
- var fragment, cacheable, cacheresults, doc;
+ var fragment, cacheable, cacheresults,
+ doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+ // Only cache "small" (1/2 KB) strings that are associated with the main document
+ // Cloning options loses the selected state, so don't cache them
+ // IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+ // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+ if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+ !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
- // webkit does not clone 'checked' attribute of radio inputs on cloneNode, so don't cache if string has a checked
- if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && args[0].indexOf("<option") < 0 && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
cacheable = true;
cacheresults = jQuery.fragments[ args[0] ];
if ( cacheresults ) {
@@ -4210,7 +4370,6 @@ function buildFragment( args, nodes, scripts ) {
}
if ( !fragment ) {
- doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
fragment = doc.createDocumentFragment();
jQuery.clean( args, doc, fragment, scripts );
}
@@ -4232,46 +4391,22 @@ jQuery.each({
replaceAll: "replaceWith"
}, function( name, original ) {
jQuery.fn[ name ] = function( selector ) {
- var ret = [], insert = jQuery( selector );
-
- for ( var i = 0, l = insert.length; i < l; i++ ) {
- var elems = (i > 0 ? this.clone(true) : this).get();
- jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
- ret = ret.concat( elems );
- }
- return this.pushStack( ret, name, insert.selector );
- };
-});
-
-jQuery.each({
- // keepData is for internal use only--do not document
- remove: function( selector, keepData ) {
- if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
- if ( !keepData && this.nodeType === 1 ) {
- jQuery.cleanData( this.getElementsByTagName("*") );
- jQuery.cleanData( [ this ] );
- }
-
- if ( this.parentNode ) {
- this.parentNode.removeChild( this );
+ var ret = [], insert = jQuery( selector ),
+ parent = this.length === 1 && this[0].parentNode;
+
+ if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+ insert[ original ]( this[0] );
+ return this;
+
+ } else {
+ for ( var i = 0, l = insert.length; i < l; i++ ) {
+ var elems = (i > 0 ? this.clone(true) : this).get();
+ jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+ ret = ret.concat( elems );
}
+
+ return this.pushStack( ret, name, insert.selector );
}
- },
-
- empty: function() {
- // Remove element nodes and prevent memory leaks
- if ( this.nodeType === 1 ) {
- jQuery.cleanData( this.getElementsByTagName("*") );
- }
-
- // Remove any remaining nodes
- while ( this.firstChild ) {
- this.removeChild( this.firstChild );
- }
- }
-}, function( name, fn ) {
- jQuery.fn[ name ] = function() {
- return this.each( fn, arguments );
};
});
@@ -4286,13 +4421,13 @@ jQuery.extend({
var ret = [];
- jQuery.each(elems, function( i, elem ) {
+ for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
if ( typeof elem === "number" ) {
elem += "";
}
if ( !elem ) {
- return;
+ continue;
}
// Convert html string into DOM nodes
@@ -4343,7 +4478,7 @@ jQuery.extend({
div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
}
- elem = jQuery.makeArray( div.childNodes );
+ elem = div.childNodes;
}
if ( elem.nodeType ) {
@@ -4351,13 +4486,13 @@ jQuery.extend({
} else {
ret = jQuery.merge( ret, elem );
}
-
- });
+ }
if ( fragment ) {
for ( var i = 0; ret[i]; i++ ) {
if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+
} else {
if ( ret[i].nodeType === 1 ) {
ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
@@ -4371,9 +4506,36 @@ jQuery.extend({
},
cleanData: function( elems ) {
- for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
- jQuery.event.remove( elem );
- jQuery.removeData( elem );
+ var data, id, cache = jQuery.cache,
+ special = jQuery.event.special,
+ deleteExpando = jQuery.support.deleteExpando;
+
+ for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+ id = elem[ jQuery.expando ];
+
+ if ( id ) {
+ data = cache[ id ];
+
+ if ( data.events ) {
+ for ( var type in data.events ) {
+ if ( special[ type ] ) {
+ jQuery.event.remove( elem, type );
+
+ } else {
+ removeEvent( elem, type, data.handle );
+ }
+ }
+ }
+
+ if ( deleteExpando ) {
+ delete elem[ jQuery.expando ];
+
+ } else if ( elem.removeAttribute ) {
+ elem.removeAttribute( jQuery.expando );
+ }
+
+ delete cache[ id ];
+ }
}
}
});
@@ -4614,15 +4776,15 @@ var jsc = now(),
rquery = /\?/,
rts = /(\?|&)_=.*?(&|$)/,
rurl = /^(\w+:)?\/\/([^\/?#]+)/,
- r20 = /%20/g;
+ r20 = /%20/g,
-jQuery.fn.extend({
- // Keep a copy of the old load
- _load: jQuery.fn.load,
+ // Keep a copy of the old load method
+ _load = jQuery.fn.load;
+jQuery.fn.extend({
load: function( url, params, callback ) {
if ( typeof url !== "string" ) {
- return this._load( url );
+ return _load.call( this, url );
// Don't do a request if no elements are being requested
} else if ( !this.length ) {
@@ -5243,7 +5405,7 @@ jQuery.extend({
if ( jQuery.isArray(obj) ) {
// Serialize array item.
jQuery.each( obj, function( i, v ) {
- if ( traditional ) {
+ if ( traditional || /\[\]$/.test( prefix ) ) {
// Treat each array item as a scalar.
add( prefix, v );
} else {
diff --git a/js/jquery.min.js b/js/jquery.min.js
index 950198f47..b170a78f8 100644
--- a/js/jquery.min.js
+++ b/js/jquery.min.js
@@ -1,5 +1,5 @@
/*!
- * jQuery JavaScript Library v1.4.1
+ * jQuery JavaScript Library v1.4.2
* http://jquery.com/
*
* Copyright 2010, John Resig
@@ -11,143 +11,145 @@
* Copyright 2010, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
*
- * Date: Mon Jan 25 19:43:33 2010 -0500
+ * Date: Sat Feb 13 22:33:48 2010 -0500
*/
-(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n<j;n++)e(a[n],b,f?d.call(a[n],n,e(a[n],b)):d,i);return a}return j?
-e(a[0],b):null}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function ma(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function na(a){var b,d=[],f=[],e=arguments,i,j,n,o,m,s,x=c.extend({},c.data(this,"events").live);if(!(a.button&&a.type==="click")){for(o in x){j=x[o];if(j.live===a.type||j.altLive&&c.inArray(a.type,j.altLive)>-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f,
-a.currentTarget);m=0;for(s=i.length;m<s;m++)for(o in x){j=x[o];n=i[m].elem;f=null;if(i[m].selector===j.selector){if(j.live==="mouseenter"||j.live==="mouseleave")f=c(a.relatedTarget).closest(j.selector)[0];if(!f||f!==n)d.push({elem:n,fn:j})}}m=0;for(s=d.length;m<s;m++){i=d[m];a.currentTarget=i.elem;a.data=i.fn.data;if(i.fn.apply(i.elem,e)===false){b=false;break}}return b}}function oa(a,b){return"live."+(a?a+".":"")+b.replace(/\./g,"`").replace(/ /g,"&")}function pa(a){return!a||!a.parentNode||a.parentNode.nodeType===
-11}function qa(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var i in f)for(var j in f[i])c.event.add(this,i,f[i][j],f[i][j].data)}}})}function ra(a,b,d){var f,e,i;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&a[0].indexOf("<option")<0&&(c.support.checkClone||!sa.test(a[0]))){e=true;if(i=c.fragments[a[0]])if(i!==1)f=i}if(!f){b=b&&b[0]?b[0].ownerDocument||b[0]:r;f=b.createDocumentFragment();
-c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=i?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(ta.concat.apply([],ta.slice(0,b)),function(){d[this]=a});return d}function ua(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Na=z.jQuery,Oa=z.$,r=z.document,S,Pa=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent,
-va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]],
-[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a,
-this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this,
-a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};
-c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(i in e){j=a[i];n=e[i];if(a!==n)if(f&&n&&(c.isPlainObject(n)||c.isArray(n))){j=j&&(c.isPlainObject(j)||c.isArray(j))?j:c.isArray(n)?[]:{};a[i]=c.extend(f,j,n)}else if(n!==v)a[i]=n}return a};c.extend({noConflict:function(a){z.$=
-Oa;if(a)z.jQuery=Na;return c},isReady:false,ready:function(){if(!c.isReady){if(!r.body)return setTimeout(c.ready,13);c.isReady=true;if(P){for(var a,b=0;a=P[b++];)a.call(r,c);P=null}c.fn.triggerHandler&&c(r).triggerHandler("ready")}},bindReady:function(){if(!va){va=true;if(r.readyState==="complete")return c.ready();if(r.addEventListener){r.addEventListener("DOMContentLoaded",L,false);z.addEventListener("load",c.ready,false)}else if(r.attachEvent){r.attachEvent("onreadystatechange",L);z.attachEvent("onload",
-c.ready);var a=false;try{a=z.frameElement==null}catch(b){}r.documentElement.doScroll&&a&&la()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,"isPrototypeOf"))return false;var b;for(b in a);return b===v||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;
-return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return z.JSON&&z.JSON.parse?z.JSON.parse(a):(new Function("return "+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Ra.test(a)){var b=r.getElementsByTagName("head")[0]||
-r.documentElement,d=r.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(r.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,i=a.length,j=i===v||c.isFunction(a);if(d)if(j)for(f in a){if(b.apply(a[f],d)===false)break}else for(;e<i;){if(b.apply(a[e++],d)===false)break}else if(j)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=
-a[0];e<i&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Sa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==
-v;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,i=a.length;e<i;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,i=0,j=a.length;i<j;i++){e=b(a[i],i,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=v}else if(b&&!c.isFunction(b)){d=b;b=v}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},
-uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});O=c.uaMatch(O);if(O.browser){c.browser[O.browser]=true;c.browser.version=O.version}if(c.browser.webkit)c.browser.safari=true;if(wa)c.inArray=function(a,b){return wa.call(b,a)};S=c(r);if(r.addEventListener)L=function(){r.removeEventListener("DOMContentLoaded",
-L,false);c.ready()};else if(r.attachEvent)L=function(){if(r.readyState==="complete"){r.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=r.documentElement,b=r.createElement("script"),d=r.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support=
-{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};
-b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=r.createDocumentFragment();a.appendChild(d.firstChild);
-c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props=
-{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true,
-{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,
-a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);
-return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||
-a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=
-c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className)for(var i=" "+e.className+" ",j=0,n=b.length;j<n;j++){if(i.indexOf(" "+b[j]+" ")<0)e.className+=" "+b[j]}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=c(this);m.removeClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string"||a===v)for(var b=(a||"").split(ca),
-d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var i=(" "+e.className+" ").replace(ya," "),j=0,n=b.length;j<n;j++)i=i.replace(" "+b[j]+" "," ");e.className=i.substring(1,i.length-1)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var i=c(this);i.toggleClass(a.call(this,e,i.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,i=0,j=c(this),n=b,o=
-a.split(ca);e=o[i++];){n=f?n:!j.hasClass(e);j[n?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(ya," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||
-{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i<d;i++){var j=e[i];if(j.selected){a=c(j).val();if(b)return a;f.push(a)}}return f}if(za.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Wa,"")}return v}var n=c.isFunction(a);return this.each(function(o){var m=c(this),s=a;if(this.nodeType===1){if(n)s=a.call(this,o,m.val());
-if(typeof s==="number")s+="";if(c.isArray(s)&&za.test(this.type))this.checked=c.inArray(m.val(),s)>=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d);
-f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=
-""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j=
-function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a,
-d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+
-s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a,
-"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,
-b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b,
-d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b=
-0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};
-c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b=
-a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!==
-"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this,
-"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"||
-d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a=
-a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,
-f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a,
-b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+
-a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e){var i,j=0;if(c.isFunction(f)){e=f;f=v}for(d=(d||"").split(/\s+/);(i=d[j++])!=null;){i=i==="focus"?"focusin":i==="blur"?"focusout":i==="hover"?d.push("mouseleave")&&"mouseenter":i;b==="live"?c(this.context).bind(oa(i,this.selector),{data:f,selector:this.selector,
-live:i},e):c(this.context).unbind(oa(i,this.selector),e?{guid:e.guid+this.selector+i}:null)}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});z.attachEvent&&!z.addEventListener&&z.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
-(function(){function a(g){for(var h="",k,l=0;g[l];l++){k=g[l];if(k.nodeType===3||k.nodeType===4)h+=k.nodeValue;else if(k.nodeType!==8)h+=a(k.childNodes)}return h}function b(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===k){y=l[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=k;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}l[q]=y}}}function d(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===
-k){y=l[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=k;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(o.filter(h,[t]).length>0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||
-typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u=
-l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&
-y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};o.matches=function(g,h){return o(g,null,null,h)};o.find=function(g,h,k){var l,q;if(!g)return[];for(var p=0,u=m.order.length;p<u;p++){var t=m.order[p];if(q=m.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");l=m.find[t](q,
-h,k);if(l!=null){g=g.replace(m.match[t],"");break}}}}l||(l=h.getElementsByTagName("*"));return{set:l,expr:g}};o.filter=function(g,h,k,l){for(var q=g,p=[],u=h,t,y,R=h&&h[0]&&w(h[0]);g&&h.length;){for(var H in m.filter)if((t=m.leftMatch[H].exec(g))!=null&&t[2]){var M=m.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(u===p)p=[];if(m.preFilter[H])if(t=m.preFilter[H](t,u,k,p,l,R)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=u[U])!=null;U++)if(D){I=M(D,t,U,u);var Da=
-l^!!I;if(k&&I!=null)if(Da)y=true;else u[U]=false;else if(Da){p.push(D);y=true}}if(I!==v){k||(u=p);g=g.replace(m.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)o.error(g);else break;q=g}return u};o.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var m=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
-TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,h){var k=typeof h==="string",l=k&&!/\W/.test(h);k=k&&!l;if(l)h=h.toLowerCase();l=0;for(var q=g.length,
-p;l<q;l++)if(p=g[l]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[l]=k||p&&p.nodeName.toLowerCase()===h?p||false:p===h}k&&o.filter(h,g,true)},">":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l<q;l++){var p=g[l];if(p){k=p.parentNode;g[l]=k.nodeName.toLowerCase()===h?k:false}}}else{l=0;for(q=g.length;l<q;l++)if(p=g[l])g[l]=k?p.parentNode:p.parentNode===h;k&&o.filter(h,g,true)}},"":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=
-h=h.toLowerCase();q=b}q("parentNode",h,l,g,p,k)},"~":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,l,g,p,k)}},find:{ID:function(g,h,k){if(typeof h.getElementById!=="undefined"&&!k)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var k=[];h=h.getElementsByName(g[1]);for(var l=0,q=h.length;l<q;l++)h[l].getAttribute("name")===g[1]&&k.push(h[l]);return k.length===0?null:k}},
-TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,k,l,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var u;(u=h[p])!=null;p++)if(u)if(q^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&
-"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);
-return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===
-g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2===
-0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return h<k[3]-0},gt:function(g,h,k){return h>k[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k<l;k++)if(h[k]===g)return false;return true}else o.error("Syntax error, unrecognized expression: "+
-q)},CHILD:function(g,h){var k=h[1],l=g;switch(k){case "only":case "first":for(;l=l.previousSibling;)if(l.nodeType===1)return false;if(k==="first")return true;l=g;case "last":for(;l=l.nextSibling;)if(l.nodeType===1)return false;return true;case "nth":k=h[2];var q=h[3];if(k===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var u=0;for(l=p.firstChild;l;l=l.nextSibling)if(l.nodeType===1)l.nodeIndex=++u;p.sizcache=h}g=g.nodeIndex-q;return k===0?g===0:g%k===0&&g/k>=
-0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="?
-k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};
-try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k<l;k++)h.push(g[k]);else for(k=0;g[k];k++)h.push(g[k]);return h}}var C;if(r.documentElement.compareDocumentPosition)C=function(g,h){if(!g.compareDocumentPosition||!h.compareDocumentPosition){if(g==h)j=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===
-h?0:1;if(g===0)j=true;return g};else if("sourceIndex"in r.documentElement)C=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)j=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)j=true;return g};else if(r.createRange)C=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)j=true;return g.ownerDocument?-1:1}var k=g.ownerDocument.createRange(),l=h.ownerDocument.createRange();k.setStart(g,0);k.setEnd(g,0);l.setStart(h,0);l.setEnd(h,0);g=k.compareBoundaryPoints(Range.START_TO_END,
-l);if(g===0)j=true;return g};(function(){var g=r.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id");
-return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href",
-2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===
-0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[],
-l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)o(g,h[q],k);return o.filter(l,k)};c.find=o;c.expr=o.selectors;c.expr[":"]=c.expr.filters;c.unique=o.uniqueSort;c.getText=a;c.isXMLDoc=w;c.contains=E})();var bb=/Until$/,cb=/^(?:parents|prevUntil|prevAll)/,db=/,/;Q=Array.prototype.slice;var Ea=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,i){return!!b.call(e,i,e)===d});else if(b.nodeType)return c.grep(a,
-function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Qa.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;c.find(a,this[f],b);if(f>0)for(var i=d;i<b.length;i++)for(var j=0;j<d;j++)if(b[j]===b[i]){b.splice(i--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=
-0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ea(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ea(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e<n;e++){j=a[e];i[j]||(i[j]=c.expr.match.POS.test(j)?c(j,b||this.context):j)}for(;f&&f.ownerDocument&&f!==b;){for(j in i){e=i[j];if(e.jquery?e.index(f)>
--1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),
-a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},
-nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):
-e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==
-b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/<tbody/i,gb=/<|&\w+;/,sa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ia=function(a,b,d){return eb.test(d)?a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],
-col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)},
-wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?
-d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,
-false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&
-!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/<script/i.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(Ha.exec(a)||
-["",""])[1].toLowerCase()]){a=a.replace(Ga,Ia);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var i=c(this),j=i.html();i.empty().append(function(){return a.call(this,e,j)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,
-b,f))});else a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(s){return c.nodeName(s,"table")?s.getElementsByTagName("tbody")[0]||s.appendChild(s.ownerDocument.createElement("tbody")):s}var e,i,j=a[0],n=[];if(!c.support.checkClone&&arguments.length===3&&typeof j===
-"string"&&sa.test(j))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(j))return this.each(function(s){var x=c(this);a[0]=j.call(this,s,b?x.html():v);x.domManip(a,b,d)});if(this[0]){e=a[0]&&a[0].parentNode&&a[0].parentNode.nodeType===11?{fragment:a[0].parentNode}:ra(a,this,n);if(i=e.fragment.firstChild){b=b&&c.nodeName(i,"tr");for(var o=0,m=this.length;o<m;o++)d.call(b?f(this[o],i):this[o],e.cacheable||this.length>1||o>0?e.fragment.cloneNode(true):e.fragment)}n&&c.each(n,
-Ma)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);for(var e=0,i=d.length;e<i;e++){var j=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),j);f=f.concat(j)}return this.pushStack(f,a,d.selector)}});c.each({remove:function(a,b){if(!a||c.filter(a,[this]).length){if(!b&&this.nodeType===1){c.cleanData(this.getElementsByTagName("*"));c.cleanData([this])}this.parentNode&&
-this.parentNode.removeChild(this)}},empty:function(){for(this.nodeType===1&&c.cleanData(this.getElementsByTagName("*"));this.firstChild;)this.removeChild(this.firstChild)}},function(a,b){c.fn[a]=function(){return this.each(b,arguments)}});c.extend({clean:function(a,b,d,f){b=b||r;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||r;var e=[];c.each(a,function(i,j){if(typeof j==="number")j+="";if(j){if(typeof j==="string"&&!gb.test(j))j=b.createTextNode(j);else if(typeof j===
-"string"){j=j.replace(Ga,Ia);var n=(Ha.exec(j)||["",""])[1].toLowerCase(),o=F[n]||F._default,m=o[0];i=b.createElement("div");for(i.innerHTML=o[1]+j+o[2];m--;)i=i.lastChild;if(!c.support.tbody){m=fb.test(j);n=n==="table"&&!m?i.firstChild&&i.firstChild.childNodes:o[1]==="<table>"&&!m?i.childNodes:[];for(o=n.length-1;o>=0;--o)c.nodeName(n[o],"tbody")&&!n[o].childNodes.length&&n[o].parentNode.removeChild(n[o])}!c.support.leadingWhitespace&&V.test(j)&&i.insertBefore(b.createTextNode(V.exec(j)[0]),i.firstChild);
-j=c.makeArray(i.childNodes)}if(j.nodeType)e.push(j);else e=c.merge(e,j)}});if(d)for(a=0;e[a];a++)if(f&&c.nodeName(e[a],"script")&&(!e[a].type||e[a].type.toLowerCase()==="text/javascript"))f.push(e[a].parentNode?e[a].parentNode.removeChild(e[a]):e[a]);else{e[a].nodeType===1&&e.splice.apply(e,[a+1,0].concat(c.makeArray(e[a].getElementsByTagName("script"))));d.appendChild(e[a])}return e},cleanData:function(a){for(var b=0,d;(d=a[b])!=null;b++){c.event.remove(d);c.removeData(d)}}});var hb=/z-?index|font-?weight|opacity|zoom|line-?height/i,
-Ja=/alpha\([^)]*\)/,Ka=/opacity=([^)]*)/,ga=/float/i,ha=/-([a-z])/ig,ib=/([A-Z])/g,jb=/^-?\d+(?:px)?$/i,kb=/^-?\d/,lb={position:"absolute",visibility:"hidden",display:"block"},mb=["Left","Right"],nb=["Top","Bottom"],ob=r.defaultView&&r.defaultView.getComputedStyle,La=c.support.cssFloat?"cssFloat":"styleFloat",ia=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===v)return c.curCSS(d,f);if(typeof e==="number"&&!hb.test(f))e+="px";c.style(d,f,e)})};
-c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return v;if((b==="width"||b==="height")&&parseFloat(d)<0)d=v;var f=a.style||a,e=d!==v;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=Ja.test(a)?a.replace(Ja,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Ka.exec(f.filter)[1])/100+"":""}if(ga.test(b))b=La;b=b.replace(ha,ia);if(e)f[b]=d;return f[b]},css:function(a,
-b,d,f){if(b==="width"||b==="height"){var e,i=b==="width"?mb:nb;function j(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(i,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,"border"+this+"Width",true))||0})}a.offsetWidth!==0?j():c.swap(a,lb,j);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&
-a.currentStyle){f=Ka.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ga.test(b))b=La;if(!d&&e&&e[b])f=e[b];else if(ob){if(ga.test(b))b="float";b=b.replace(ib,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ha,ia);f=a.currentStyle[b]||a.currentStyle[d];if(!jb.test(f)&&kb.test(f)){b=e.left;var i=a.runtimeStyle.left;a.runtimeStyle.left=
-a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=i}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var pb=
-J(),qb=/<script(.|\s)*?\/script>/gi,rb=/select|textarea/i,sb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ja=/\?/,tb=/(\?|&)_=.*?(&|$)/,ub=/^(\w+:)?\/\/([^\/?#]+)/,vb=/%20/g;c.fn.extend({_load:c.fn.load,load:function(a,b,d){if(typeof a!=="string")return this._load(a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=
-c.param(b,c.ajaxSettings.traditional);f="POST"}var i=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(j,n){if(n==="success"||n==="notmodified")i.html(e?c("<div />").append(j.responseText.replace(qb,"")).find(e):j.responseText);d&&i.each(d,[j.responseText,n,j])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&
-(this.checked||rb.test(this.nodeName)||sb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,
-b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:z.XMLHttpRequest&&(z.location.protocol!=="file:"||!z.ActiveXObject)?function(){return new z.XMLHttpRequest}:
-function(){try{return new z.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&e.success.call(o,n,j,w);e.global&&f("ajaxSuccess",[w,e])}function d(){e.complete&&e.complete.call(o,w,j);e.global&&f("ajaxComplete",[w,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}
-function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),i,j,n,o=a&&a.context||e,m=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(m==="GET")N.test(e.url)||(e.url+=(ja.test(e.url)?"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||
-N.test(e.url))){i=e.jsonpCallback||"jsonp"+pb++;if(e.data)e.data=(e.data+"").replace(N,"="+i+"$1");e.url=e.url.replace(N,"="+i+"$1");e.dataType="script";z[i]=z[i]||function(q){n=q;b();d();z[i]=v;try{delete z[i]}catch(p){}A&&A.removeChild(B)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===false&&m==="GET"){var s=J(),x=e.url.replace(tb,"$1_="+s+"$2");e.url=x+(x===e.url?(ja.test(e.url)?"&":"?")+"_="+s:"")}if(e.data&&m==="GET")e.url+=(ja.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&
-c.event.trigger("ajaxStart");s=(s=ub.exec(e.url))&&(s[1]&&s[1]!==location.protocol||s[2]!==location.host);if(e.dataType==="script"&&m==="GET"&&s){var A=r.getElementsByTagName("head")[0]||r.documentElement,B=r.createElement("script");B.src=e.url;if(e.scriptCharset)B.charset=e.scriptCharset;if(!i){var C=false;B.onload=B.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;b();d();B.onload=B.onreadystatechange=null;A&&B.parentNode&&
-A.removeChild(B)}}}A.insertBefore(B,A.firstChild);return v}var E=false,w=e.xhr();if(w){e.username?w.open(m,e.url,e.async,e.username,e.password):w.open(m,e.url,e.async);try{if(e.data||a&&a.contentType)w.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[e.url]);c.etag[e.url]&&w.setRequestHeader("If-None-Match",c.etag[e.url])}s||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",
-e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(fa){}if(e.beforeSend&&e.beforeSend.call(o,w,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");w.abort();return false}e.global&&f("ajaxSend",[w,e]);var g=w.onreadystatechange=function(q){if(!w||w.readyState===0||q==="abort"){E||d();E=true;if(w)w.onreadystatechange=c.noop}else if(!E&&w&&(w.readyState===4||q==="timeout")){E=true;w.onreadystatechange=c.noop;j=q==="timeout"?"timeout":!c.httpSuccess(w)?
-"error":e.ifModified&&c.httpNotModified(w,e.url)?"notmodified":"success";var p;if(j==="success")try{n=c.httpData(w,e.dataType,e)}catch(u){j="parsererror";p=u}if(j==="success"||j==="notmodified")i||b();else c.handleError(e,w,j,p);d();q==="timeout"&&w.abort();if(e.async)w=null}};try{var h=w.abort;w.abort=function(){w&&h.call(w);g("abort")}}catch(k){}e.async&&e.timeout>0&&setTimeout(function(){w&&!E&&g("timeout")},e.timeout);try{w.send(m==="POST"||m==="PUT"||m==="DELETE"?e.data:null)}catch(l){c.handleError(e,
-w,null,l);d()}e.async||g();return w}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=
-f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(j,n){if(c.isArray(n))c.each(n,
-function(o,m){b?f(j,m):d(j+"["+(typeof m==="object"||c.isArray(m)?o:"")+"]",m)});else!b&&n!=null&&typeof n==="object"?c.each(n,function(o,m){d(j+"["+o+"]",m)}):f(j,n)}function f(j,n){n=c.isFunction(n)?n():n;e[e.length]=encodeURIComponent(j)+"="+encodeURIComponent(n)}var e=[];if(b===v)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var i in a)d(i,a[i]);return e.join("&").replace(vb,"+")}});var ka={},wb=/toggle|show|hide/,xb=/^([+-]=)?([\d+-.]+)(.*)$/,
-W,ta=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(ka[d])f=ka[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();
-ka[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&
-c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var i=c.extend({},e),j,n=this.nodeType===1&&c(this).is(":hidden"),
-o=this;for(j in a){var m=j.replace(ha,ia);if(j!==m){a[m]=a[j];delete a[j];j=m}if(a[j]==="hide"&&n||a[j]==="show"&&!n)return i.complete.call(this);if((j==="height"||j==="width")&&this.style){i.display=c.css(this,"display");i.overflow=this.style.overflow}if(c.isArray(a[j])){(i.specialEasing=i.specialEasing||{})[j]=a[j][1];a[j]=a[j][0]}}if(i.overflow!=null)this.style.overflow="hidden";i.curAnim=c.extend({},a);c.each(a,function(s,x){var A=new c.fx(o,i,s);if(wb.test(x))A[x==="toggle"?n?"show":"hide":x](a);
-else{var B=xb.exec(x),C=A.cur(true)||0;if(B){x=parseFloat(B[2]);var E=B[3]||"px";if(E!=="px"){o.style[s]=(x||1)+E;C=(x||1)/A.cur(true)*C;o.style[s]=C+E}if(B[1])x=(B[1]==="-="?-1:1)*x+C;A.custom(C,x,E)}else A.custom(C,x,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",
-1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration==="number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,
-b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==
-null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(i){return e.step(i)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop===
-"width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=
-this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=
-c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=
-null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in r.documentElement?function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),
-f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(s){c.offset.setOffset(this,a,s)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=
-b,e=b.ownerDocument,i,j=e.documentElement,n=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var o=b.offsetTop,m=b.offsetLeft;(b=b.parentNode)&&b!==n&&b!==j;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;i=e?e.getComputedStyle(b,null):b.currentStyle;o-=b.scrollTop;m-=b.scrollLeft;if(b===d){o+=b.offsetTop;m+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){o+=parseFloat(i.borderTopWidth)||
-0;m+=parseFloat(i.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&i.overflow!=="visible"){o+=parseFloat(i.borderTopWidth)||0;m+=parseFloat(i.borderLeftWidth)||0}f=i}if(f.position==="relative"||f.position==="static"){o+=n.offsetTop;m+=n.offsetLeft}if(c.offset.supportsFixedPosition&&f.position==="fixed"){o+=Math.max(j.scrollTop,n.scrollTop);m+=Math.max(j.scrollLeft,n.scrollLeft)}return{top:o,left:m}};c.offset={initialize:function(){var a=r.body,b=r.createElement("div"),
-d,f,e,i=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);
-d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i;a.removeChild(b);c.offset.initialize=c.noop},
-bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),i=parseInt(c.curCSS(a,"top",true),10)||0,j=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,d,e);d={top:b.top-e.top+i,left:b.left-
-e.left+j};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=
-this.offsetParent||r.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],i;if(!e)return null;if(f!==v)return this.each(function(){if(i=ua(this))i.scrollTo(!a?f:c(i).scrollLeft(),a?f:c(i).scrollTop());else this[d]=f});else return(i=ua(e))?"pageXOffset"in i?i[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&i.document.documentElement[d]||i.document.body[d]:e[d]}});
-c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(i){var j=c(this);j[d](f.call(this,i,j[d]()))});return"scrollTo"in e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||
-e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===v?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});z.jQuery=z.$=c})(window);
+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
+e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
+j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
+"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
+true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
+Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
+(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
+a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
+c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
+L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
+"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
+d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
+a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
+!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
+true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
+parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
+s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
+applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
+else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
+a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
+w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
+cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
+i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
+" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
+this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
+e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
+null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
+"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
+a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
+isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
+{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
+if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
+e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
+!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
+toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
+u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
+function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
+if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
+for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
+1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
+relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
+l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
+h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
+g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
+h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
+m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
+"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
+!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
+h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
+q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
+if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
+(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
+gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
+c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
+{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
+a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
+a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
+this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
+u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
+1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
+return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
+""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
+"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
+"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
+1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
+"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
+if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
+this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
+"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
+animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
+j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
+this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
+"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
+c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
+c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
+function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
+this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
+k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
+f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/js/util.js b/js/util.js
index 3623337b9..949aec957 100644
--- a/js/util.js
+++ b/js/util.js
@@ -54,7 +54,8 @@ var SN = { // StatusNet
NoticeGeoName: 'notice_data-geo_name',
NoticeDataGeo: 'notice_data-geo',
NoticeDataGeoCookie: 'notice_data-geo_cookie',
- NoticeDataGeoSelected: 'notice_data-geo_selected'
+ NoticeDataGeoSelected: 'notice_data-geo_selected',
+ StatusNetInstance:'StatusNetInstance'
}
},
@@ -319,18 +320,12 @@ var SN = { // StatusNet
}
},
- NoticeReplyTo: function(notice_item) {
- var notice = notice_item[0];
- var notice_reply = $('.notice_reply', notice)[0];
-
- if (jQuery.data(notice_reply, "ElementData") === undefined) {
- jQuery.data(notice_reply, "ElementData", {Bind:'submit'});
- $(notice_reply).bind('click', function() {
- var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
- SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
- return false;
- });
- }
+ NoticeReplyTo: function(notice) {
+ notice.find('.notice_reply').live('click', function() {
+ var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
+ SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
+ return false;
+ });
},
NoticeReplySet: function(nick,id) {
@@ -670,6 +665,35 @@ var SN = { // StatusNet
date.setFullYear(year, month, day);
return date;
+ },
+
+ StatusNetInstance: {
+ Set: function(value) {
+ var SNI = SN.U.StatusNetInstance.Get();
+ if (SNI !== null) {
+ value = $.extend(SNI, value);
+ }
+
+ $.cookie(
+ SN.C.S.StatusNetInstance,
+ JSON.stringify(value),
+ {
+ path: '/',
+ expires: SN.U.GetFullYear(2029, 0, 1)
+ });
+ },
+
+ Get: function() {
+ var cookieValue = $.cookie(SN.C.S.StatusNetInstance);
+ if (cookieValue !== null) {
+ return JSON.parse(cookieValue);
+ }
+ return null;
+ },
+
+ Delete: function() {
+ $.cookie(SN.C.S.StatusNetInstance, null);
+ }
}
},
@@ -707,6 +731,20 @@ var SN = { // StatusNet
SN.U.NewDirectMessage();
}
+ },
+
+ Login: function() {
+ if (SN.U.StatusNetInstance.Get() !== null) {
+ var nickname = SN.U.StatusNetInstance.Get().Nickname;
+ if (nickname !== null) {
+ $('#form_login #nickname').val(nickname);
+ }
+ }
+
+ $('#form_login').bind('submit', function() {
+ SN.U.StatusNetInstance.Set({Nickname: $('#form_login #nickname').val()});
+ return true;
+ });
}
}
};
@@ -721,5 +759,8 @@ $(document).ready(function(){
if ($('#content .entity_actions').length > 0) {
SN.Init.EntityActions();
}
+ if ($('#form_login').length > 0) {
+ SN.Init.Login();
+ }
});
diff --git a/lib/action.php b/lib/action.php
index fa9ddb911..a7e0eb33b 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -976,7 +976,7 @@ class Action extends HTMLOutputter // lawsuit
if (is_null($arg)) {
return $def;
- } else if (in_array($arg, array('true', 'yes', '1'))) {
+ } else if (in_array($arg, array('true', 'yes', '1', 'on'))) {
return true;
} else if (in_array($arg, array('false', 'no', '0'))) {
return false;
diff --git a/lib/activity.php b/lib/activity.php
index 5cbab8d5f..b20153213 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -154,7 +154,15 @@ class PoCo
PoCo::NS
);
- array_push($urls, new PoCoURL($type, $value, $primary));
+ $isPrimary = false;
+
+ if (isset($primary) && $primary == 'true') {
+ $isPrimary = true;
+ }
+
+ // @todo check to make sure a primary hasn't already been added
+
+ array_push($urls, new PoCoURL($type, $value, $isPrimary));
}
return $urls;
}
@@ -167,16 +175,18 @@ class PoCo
PoCo::NS
);
- $formatted = ActivityUtils::childContent(
- $addressEl,
- PoCoAddress::FORMATTED,
- self::NS
- );
+ if (!empty($addressEl)) {
+ $formatted = ActivityUtils::childContent(
+ $addressEl,
+ PoCoAddress::FORMATTED,
+ self::NS
+ );
- if (!empty($formatted)) {
- $address = new PoCoAddress();
- $address->formatted = $formatted;
- return $address;
+ if (!empty($formatted)) {
+ $address = new PoCoAddress();
+ $address->formatted = $formatted;
+ return $address;
+ }
}
return null;
@@ -213,6 +223,46 @@ class PoCo
return $poco;
}
+ function fromGroup($group)
+ {
+ if (empty($group)) {
+ return null;
+ }
+
+ $poco = new PoCo();
+
+ $poco->preferredUsername = $group->nickname;
+ $poco->displayName = $group->getBestName();
+
+ $poco->note = $group->description;
+
+ $paddy = new PoCoAddress();
+ $paddy->formatted = $group->location;
+ $poco->address = $paddy;
+
+ if (!empty($group->homepage)) {
+ array_push(
+ $poco->urls,
+ new PoCoURL(
+ 'homepage',
+ $group->homepage,
+ true
+ )
+ );
+ }
+
+ return $poco;
+ }
+
+ function getPrimaryURL()
+ {
+ foreach ($this->urls as $url) {
+ if ($url->primary) {
+ return $url;
+ }
+ }
+ }
+
function asString()
{
$xs = new XMLStringer(true);
@@ -292,7 +342,7 @@ class ActivityUtils
* @return string related link, if any
*/
- static function getLink($element, $rel, $type=null)
+ static function getLink(DOMNode $element, $rel, $type=null)
{
$links = $element->getElementsByTagnameNS(self::ATOM, self::LINK);
@@ -310,6 +360,25 @@ class ActivityUtils
return null;
}
+ static function getLinks(DOMNode $element, $rel, $type=null)
+ {
+ $links = $element->getElementsByTagnameNS(self::ATOM, self::LINK);
+ $out = array();
+
+ foreach ($links as $link) {
+
+ $linkRel = $link->getAttribute(self::REL);
+ $linkType = $link->getAttribute(self::TYPE);
+
+ if ($linkRel == $rel &&
+ (is_null($type) || $linkType == $type)) {
+ $out[] = $link;
+ }
+ }
+
+ return $out;
+ }
+
/**
* Gets the first child element with the given tag
*
@@ -320,7 +389,7 @@ class ActivityUtils
* @return DOMElement found element or null
*/
- static function child($element, $tag, $namespace=self::ATOM)
+ static function child(DOMNode $element, $tag, $namespace=self::ATOM)
{
$els = $element->childNodes;
if (empty($els) || $els->length == 0) {
@@ -345,7 +414,7 @@ class ActivityUtils
* @return string content of the child
*/
- static function childContent($element, $tag, $namespace=self::ATOM)
+ static function childContent(DOMNode $element, $tag, $namespace=self::ATOM)
{
$el = self::child($element, $tag, $namespace);
@@ -415,6 +484,75 @@ class ActivityUtils
}
}
+// XXX: Arg! This wouldn't be necessary if we used Avatars conistently
+class AvatarLink
+{
+ public $url;
+ public $type;
+ public $size;
+ public $width;
+ public $height;
+
+ function __construct($element=null)
+ {
+ if ($element) {
+ // @fixme use correct namespaces
+ $this->url = $element->getAttribute('href');
+ $this->type = $element->getAttribute('type');
+ $width = $element->getAttribute('media:width');
+ if ($width != null) {
+ $this->width = intval($width);
+ }
+ $height = $element->getAttribute('media:height');
+ if ($height != null) {
+ $this->height = intval($height);
+ }
+ }
+ }
+
+ static function fromAvatar($avatar)
+ {
+ if (empty($avatar)) {
+ return null;
+ }
+ $alink = new AvatarLink();
+ $alink->type = $avatar->mediatype;
+ $alink->height = $avatar->height;
+ $alink->width = $avatar->width;
+ $alink->url = $avatar->displayUrl();
+ return $alink;
+ }
+
+ static function fromFilename($filename, $size)
+ {
+ $alink = new AvatarLink();
+ $alink->url = $filename;
+ $alink->height = $size;
+ if (!empty($filename)) {
+ $alink->width = $size;
+ $alink->type = self::mediatype($filename);
+ } else {
+ $alink->url = User_group::defaultLogo($size);
+ $alink->type = 'image/png';
+ }
+ return $alink;
+ }
+
+ // yuck!
+ static function mediatype($filename) {
+ $ext = strtolower(end(explode('.', $filename)));
+ if ($ext == 'jpeg') {
+ $ext = 'jpg';
+ }
+ // hope we don't support any others
+ $types = array('png', 'gif', 'jpg', 'jpeg');
+ if (in_array($ext, $types)) {
+ return 'image/' . $ext;
+ }
+ return null;
+ }
+}
+
/**
* A noun-ish thing in the activity universe
*
@@ -471,7 +609,7 @@ class ActivityObject
public $content;
public $link;
public $source;
- public $avatar;
+ public $avatarLinks = array();
public $geopoint;
public $poco;
public $displayName;
@@ -494,6 +632,12 @@ class ActivityObject
$this->element = $element;
+ $this->geopoint = $this->_childContent(
+ $element,
+ ActivityContext::POINT,
+ ActivityContext::GEORSS
+ );
+
if ($element->tagName == 'author') {
$this->type = self::PERSON; // XXX: is this fair?
@@ -533,8 +677,10 @@ class ActivityObject
if ($this->type == self::PERSON || $this->type == self::GROUP) {
$this->displayName = $this->title;
- // @fixme we may have multiple avatars with different resolutions specified
- $this->avatar = ActivityUtils::getLink($element, 'avatar');
+ $avatars = ActivityUtils::getLinks($element, 'avatar');
+ foreach ($avatars as $link) {
+ $this->avatarLinks[] = new AvatarLink($link);
+ }
$this->poco = new PoCo($element);
}
@@ -585,10 +731,40 @@ class ActivityObject
$object->id = $profile->getUri();
$object->title = $profile->getBestName();
$object->link = $profile->profileurl;
- $object->avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+ $orig = $profile->getOriginalAvatar();
+
+ if (!empty($orig)) {
+ $object->avatarLinks[] = AvatarLink::fromAvatar($orig);
+ }
+
+ $sizes = array(
+ AVATAR_PROFILE_SIZE,
+ AVATAR_STREAM_SIZE,
+ AVATAR_MINI_SIZE
+ );
+
+ foreach ($sizes as $size) {
+
+ $alink = null;
+ $avatar = $profile->getAvatar($size);
+
+ if (!empty($avatar)) {
+ $alink = AvatarLink::fromAvatar($avatar);
+ } else {
+ $alink = new AvatarLink();
+ $alink->type = 'image/png';
+ $alink->height = $size;
+ $alink->width = $size;
+ $alink->url = Avatar::defaultImage($size);
+ }
+
+ $object->avatarLinks[] = $alink;
+ }
if (isset($profile->lat) && isset($profile->lon)) {
- $object->geopoint = (float)$profile->lat . ' ' . (float)$profile->lon;
+ $object->geopoint = (float)$profile->lat
+ . ' ' . (float)$profile->lon;
}
$object->poco = PoCo::fromProfile($profile);
@@ -596,6 +772,36 @@ class ActivityObject
return $object;
}
+ static function fromGroup($group)
+ {
+ $object = new ActivityObject();
+
+ $object->type = ActivityObject::GROUP;
+ $object->id = $group->getUri();
+ $object->title = $group->getBestName();
+ $object->link = $group->getUri();
+
+ $object->avatarLinks[] = AvatarLink::fromFilename(
+ $group->homepage_logo,
+ AVATAR_PROFILE_SIZE
+ );
+
+ $object->avatarLinks[] = AvatarLink::fromFilename(
+ $group->stream_logo,
+ AVATAR_STREAM_SIZE
+ );
+
+ $object->avatarLinks[] = AvatarLink::fromFilename(
+ $group->mini_logo,
+ AVATAR_MINI_SIZE
+ );
+
+ $object->poco = PoCo::fromGroup($group);
+
+ return $object;
+ }
+
+
function asString($tag='activity:object')
{
$xs = new XMLStringer(true);
@@ -633,16 +839,19 @@ class ActivityObject
if ($this->type == ActivityObject::PERSON
|| $this->type == ActivityObject::GROUP) {
- $xs->element(
- 'link', array(
- 'type' => empty($this->avatar) ? 'image/png' : $this->avatar->mediatype,
- 'rel' => 'avatar',
- 'href' => empty($this->avatar)
- ? Avatar::defaultImage(AVATAR_PROFILE_SIZE)
- : $this->avatar->displayUrl()
- ),
- null
- );
+
+ foreach ($this->avatarLinks as $avatar) {
+ $xs->element(
+ 'link', array(
+ 'rel' => 'avatar',
+ 'type' => $avatar->type,
+ 'media:width' => $avatar->width,
+ 'media:height' => $avatar->height,
+ 'href' => $avatar->url
+ ),
+ null
+ );
+ }
}
if (!empty($this->geopoint)) {
@@ -691,6 +900,9 @@ class ActivityVerb
const UNFAVORITE = 'http://ostatus.org/schema/1.0/unfavorite';
const UNFOLLOW = 'http://ostatus.org/schema/1.0/unfollow';
const LEAVE = 'http://ostatus.org/schema/1.0/leave';
+
+ // For simple profile-update pings; no content to share.
+ const UPDATE_PROFILE = 'http://ostatus.org/schema/1.0/update-profile';
}
class ActivityContext
@@ -756,22 +968,29 @@ class ActivityContext
for ($i = 0; $i < $points->length; $i++) {
$point = $points->item($i)->textContent;
- $point = str_replace(',', ' ', $point); // per spec "treat commas as whitespace"
- $point = preg_replace('/\s+/', ' ', $point);
- $point = trim($point);
- $coords = explode(' ', $point);
- if (count($coords) == 2) {
- list($lat, $lon) = $coords;
- if (is_numeric($lat) && is_numeric($lon)) {
- common_log(LOG_INFO, "Looking up location for $lat $lon from georss");
- return Location::fromLatLon($lat, $lon);
- }
- }
- common_log(LOG_ERR, "Ignoring bogus georss:point value $point");
+ return self::locationFromPoint($point);
}
return null;
}
+
+ // XXX: Move to ActivityUtils or Location?
+ static function locationFromPoint($point)
+ {
+ $point = str_replace(',', ' ', $point); // per spec "treat commas as whitespace"
+ $point = preg_replace('/\s+/', ' ', $point);
+ $point = trim($point);
+ $coords = explode(' ', $point);
+ if (count($coords) == 2) {
+ list($lat, $lon) = $coords;
+ if (is_numeric($lat) && is_numeric($lon)) {
+ common_log(LOG_INFO, "Looking up location for $lat $lon from georss point");
+ return Location::fromLatLon($lat, $lon);
+ }
+ }
+ common_log(LOG_ERR, "Ignoring bogus georss:point value $point");
+ return null;
+ }
}
/**
@@ -824,6 +1043,7 @@ class Activity
public $content; // HTML content of activity
public $id; // ID of the activity
public $title; // title of the activity
+ public $categories = array(); // list of AtomCategory objects
/**
* Turns a regular old Atom <entry> into a magical activity
@@ -912,6 +1132,14 @@ class Activity
$this->summary = ActivityUtils::childContent($entry, 'summary');
$this->id = ActivityUtils::childContent($entry, 'id');
$this->content = ActivityUtils::getContent($entry);
+
+ $catEls = $entry->getElementsByTagNameNS(self::ATOM, 'category');
+ if ($catEls) {
+ for ($i = 0; $i < $catEls->length; $i++) {
+ $catEl = $catEls->item($i);
+ $this->categories[] = new AtomCategory($catEl);
+ }
+ }
}
/**
@@ -934,7 +1162,8 @@ class Activity
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
'xmlns:georss' => 'http://www.georss.org/georss',
'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
- 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0');
+ 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
+ 'xmlns:media' => 'http://purl.org/syndication/atommedia');
} else {
$attrs = array();
}
@@ -957,11 +1186,28 @@ class Activity
}
// XXX: add context
- // XXX: add target
+ $xs->elementStart('author');
+ $xs->element('uri', array(), $this->actor->id);
+ if ($this->actor->title) {
+ $xs->element('name', array(), $this->actor->title);
+ }
+ $xs->elementEnd('author');
$xs->raw($this->actor->asString('activity:actor'));
+
$xs->element('activity:verb', null, $this->verb);
- $xs->raw($this->object->asString());
+
+ if ($this->object) {
+ $xs->raw($this->object->asString());
+ }
+
+ if ($this->target) {
+ $xs->raw($this->target->asString('activity:target'));
+ }
+
+ foreach ($this->categories as $cat) {
+ $xs->raw($cat->asString());
+ }
$xs->elementEnd('entry');
@@ -972,4 +1218,50 @@ class Activity
{
return ActivityUtils::child($element, $tag, $namespace);
}
-} \ No newline at end of file
+}
+
+class AtomCategory
+{
+ public $term;
+ public $scheme;
+ public $label;
+
+ function __construct($element=null)
+ {
+ if ($element && $element->attributes) {
+ $this->term = $this->extract($element, 'term');
+ $this->scheme = $this->extract($element, 'scheme');
+ $this->label = $this->extract($element, 'label');
+ }
+ }
+
+ protected function extract($element, $attrib)
+ {
+ $node = $element->attributes->getNamedItemNS(Activity::ATOM, $attrib);
+ if ($node) {
+ return trim($node->textContent);
+ }
+ $node = $element->attributes->getNamedItem($attrib);
+ if ($node) {
+ return trim($node->textContent);
+ }
+ return null;
+ }
+
+ function asString()
+ {
+ $attribs = array();
+ if ($this->term !== null) {
+ $attribs['term'] = $this->term;
+ }
+ if ($this->scheme !== null) {
+ $attribs['scheme'] = $this->scheme;
+ }
+ if ($this->label !== null) {
+ $attribs['label'] = $this->label;
+ }
+ $xs = new XMLStringer();
+ $xs->element('category', $attribs);
+ return $xs->asString();
+ }
+}
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index f05627b31..536d97cdf 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -103,7 +103,7 @@ class AdminPanelAction extends Action
$name = mb_substr($name, 0, -10);
- if (!in_array($name, common_config('admin', 'panels'))) {
+ if (!self::canAdmin($name)) {
$this->clientError(_('Changes to that panel are not allowed.'), 403);
return false;
}
@@ -262,6 +262,17 @@ class AdminPanelAction extends Action
return $result;
}
+
+ function canAdmin($name)
+ {
+ $isOK = false;
+
+ if (Event::handle('AdminPanelCheck', array($name, &$isOK))) {
+ $isOK = in_array($name, common_config('admin', 'panels'));
+ }
+
+ return $isOK;
+ }
}
/**
@@ -307,32 +318,32 @@ class AdminPanelNav extends Widget
if (Event::handle('StartAdminPanelNav', array($this))) {
- if ($this->canAdmin('site')) {
+ if (AdminPanelAction::canAdmin('site')) {
$this->out->menuItem(common_local_url('siteadminpanel'), _('Site'),
_('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel');
}
- if ($this->canAdmin('design')) {
+ if (AdminPanelAction::canAdmin('design')) {
$this->out->menuItem(common_local_url('designadminpanel'), _('Design'),
_('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel');
}
- if ($this->canAdmin('user')) {
+ if (AdminPanelAction::canAdmin('user')) {
$this->out->menuItem(common_local_url('useradminpanel'), _('User'),
_('User configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel');
}
- if ($this->canAdmin('access')) {
+ if (AdminPanelAction::canAdmin('access')) {
$this->out->menuItem(common_local_url('accessadminpanel'), _('Access'),
_('Access configuration'), $action_name == 'accessadminpanel', 'nav_design_admin_panel');
}
- if ($this->canAdmin('paths')) {
+ if (AdminPanelAction::canAdmin('paths')) {
$this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
_('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
}
- if ($this->canAdmin('sessions')) {
+ if (AdminPanelAction::canAdmin('sessions')) {
$this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
_('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_design_admin_panel');
}
@@ -342,8 +353,4 @@ class AdminPanelNav extends Widget
$this->action->elementEnd('ul');
}
- function canAdmin($name)
- {
- return in_array($name, common_config('admin', 'panels'));
- }
}
diff --git a/lib/api.php b/lib/apiaction.php
index 0bcf4cc21..2af150ab9 100644
--- a/lib/api.php
+++ b/lib/apiaction.php
@@ -1218,7 +1218,12 @@ class ApiAction extends Action
return User_group::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
$nickname = common_canonical_nickname($this->arg('id'));
- return User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+ if (empty($local)) {
+ return null;
+ } else {
+ return User_group::staticGet('id', $local->id);
+ }
} else if ($this->arg('group_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
@@ -1227,14 +1232,24 @@ class ApiAction extends Action
}
} else if ($this->arg('group_name')) {
$nickname = common_canonical_nickname($this->arg('group_name'));
- return User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+ if (empty($local)) {
+ return null;
+ } else {
+ return User_group::staticGet('id', $local->id);
+ }
}
} else if (is_numeric($id)) {
return User_group::staticGet($id);
} else {
$nickname = common_canonical_nickname($id);
- return User_group::staticGet('nickname', $nickname);
+ $local = Local_group::staticGet('nickname', $nickname);
+ if (empty($local)) {
+ return null;
+ } else {
+ return User_group::staticGet('id', $local->group_id);
+ }
}
}
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 25e2196cf..5090871cf 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -38,7 +38,6 @@ if (!defined('STATUSNET')) {
exit(1);
}
-require_once INSTALLDIR . '/lib/api.php';
require_once INSTALLDIR . '/lib/apioauth.php';
/**
diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index d2bf2a416..3c3556cb9 100644
--- a/lib/atomnoticefeed.php
+++ b/lib/atomnoticefeed.php
@@ -65,6 +65,11 @@ class AtomNoticeFeed extends Atom10Feed
);
$this->addNamespace(
+ 'media',
+ 'http://purl.org/syndication/atommedia'
+ );
+
+ $this->addNamespace(
'poco',
'http://portablecontacts.net/spec/1.0'
);
diff --git a/lib/common.php b/lib/common.php
index 68723955e..2dbe3b3c5 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
//exit with 200 response, if this is checking fancy from the installer
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
-define('STATUSNET_VERSION', '0.9.0beta5');
+define('STATUSNET_VERSION', '0.9.0beta6');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'Stand');
diff --git a/lib/default.php b/lib/default.php
index bb7708bfc..d849055c2 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -278,7 +278,6 @@ $default =
'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
'Geonames' => null,
'Mapstraction' => null,
- 'Linkback' => null,
'WikiHashtags' => null,
'OpenID' => null),
),
diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php
index dc183fb36..d2be7a92c 100644
--- a/lib/distribqueuehandler.php
+++ b/lib/distribqueuehandler.php
@@ -63,24 +63,12 @@ class DistribQueueHandler
// XXX: do we need to change this for remote users?
try {
- $notice->saveTags();
- } catch (Exception $e) {
- $this->logit($notice, $e);
- }
-
- try {
$notice->addToInboxes();
} catch (Exception $e) {
$this->logit($notice, $e);
}
try {
- $notice->saveUrls();
- } catch (Exception $e) {
- $this->logit($notice, $e);
- }
-
- try {
Event::handle('EndNoticeSave', array($notice));
// Enqueue for other handlers
} catch (Exception $e) {
diff --git a/lib/joinform.php b/lib/joinform.php
index aefb553aa..aa8bc20e2 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -100,7 +100,7 @@ class JoinForm extends Form
function action()
{
return common_local_url('joingroup',
- array('nickname' => $this->group->nickname));
+ array('id' => $this->group->id));
}
/**
diff --git a/lib/leaveform.php b/lib/leaveform.php
index e63d96ee8..5469b5704 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -100,7 +100,7 @@ class LeaveForm extends Form
function action()
{
return common_local_url('leavegroup',
- array('nickname' => $this->group->nickname));
+ array('id' => $this->group->id));
}
/**
diff --git a/lib/noticelist.php b/lib/noticelist.php
index dcf17be08..7d1d2828f 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -380,12 +380,12 @@ class NoticeListItem extends Widget
function showNoticeLink()
{
- if($this->notice->is_local == Notice::LOCAL_PUBLIC || $this->notice->is_local == Notice::LOCAL_NONPUBLIC){
- $noticeurl = common_local_url('shownotice',
- array('notice' => $this->notice->id));
- }else{
- $noticeurl = $this->notice->uri;
- }
+ $noticeurl = $this->notice->bestUrl();
+
+ // above should always return an URL
+
+ assert(!empty($noticeurl));
+
$this->out->elementStart('a', array('rel' => 'bookmark',
'class' => 'timestamp',
'href' => $noticeurl));
@@ -540,16 +540,13 @@ class NoticeListItem extends Widget
function showContext()
{
$hasConversation = false;
- if( !empty($this->notice->conversation)
- && $this->notice->conversation != $this->notice->id){
- $hasConversation = true;
- }else{
- $conversation = Notice::conversationStream($this->notice->id, 1, 1);
- if($conversation->N > 0){
+ if (!empty($this->notice->conversation)) {
+ $conversation = Notice::conversationStream($this->notice->conversation, 1, 1);
+ if ($conversation->N > 0) {
$hasConversation = true;
}
}
- if ($hasConversation){
+ if ($hasConversation) {
$this->out->text(' ');
$convurl = common_local_url('conversation',
array('id' => $this->notice->conversation));
diff --git a/lib/profilequeuehandler.php b/lib/profilequeuehandler.php
new file mode 100644
index 000000000..6ce93229b
--- /dev/null
+++ b/lib/profilequeuehandler.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @package QueueHandler
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+class ProfileQueueHandler extends QueueHandler
+{
+
+ function transport()
+ {
+ return 'profile';
+ }
+
+ function handle($profile)
+ {
+ if (!($profile instanceof Profile)) {
+ common_log(LOG_ERR, "Got a bogus profile, not broadcasting");
+ return true;
+ }
+
+ if (Event::handle('StartBroadcastProfile', array($profile))) {
+ require_once(INSTALLDIR.'/lib/omb.php');
+ try {
+ omb_broadcast_profile($profile);
+ } catch (Exception $e) {
+ common_log(LOG_ERR, "Failed sending OMB profiles: " . $e->getMessage());
+ }
+ }
+ Event::handle('EndBroadcastProfile', array($profile));
+ return true;
+ }
+
+}
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 8f8c8f133..9fdc80110 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -262,6 +262,9 @@ abstract class QueueManager extends IoManager
$this->connect('sms', 'SmsQueueHandler');
}
+ // Broadcasting profile updates to OMB remote subscribers
+ $this->connect('profile', 'ProfileQueueHandler');
+
// XMPP output handlers...
if (common_config('xmpp', 'enabled')) {
// Delivery prep, read by queuedaemon.php:
diff --git a/lib/router.php b/lib/router.php
index 987d0152e..abbce041d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -247,6 +247,9 @@ class Router
$m->connect('group/:nickname/'.$v,
array('action' => $v.'group'),
array('nickname' => '[a-zA-Z0-9]+'));
+ $m->connect('group/:id/id/'.$v,
+ array('action' => $v.'group'),
+ array('id' => '[0-9]+'));
}
foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
@@ -668,7 +671,7 @@ class Router
foreach (array('subscriptions', 'subscribers',
'all', 'foaf', 'xrds',
- 'replies', 'microsummary') as $a) {
+ 'replies', 'microsummary', 'hcard') as $a) {
$m->connect($a,
array('action' => $a,
'nickname' => $nickname));
@@ -734,7 +737,7 @@ class Router
foreach (array('subscriptions', 'subscribers',
'nudge', 'all', 'foaf', 'xrds',
- 'replies', 'inbox', 'outbox', 'microsummary') as $a) {
+ 'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
$m->connect(':nickname/'.$a,
array('action' => $a),
array('nickname' => '[a-zA-Z0-9]{1,64}'));
diff --git a/lib/util.php b/lib/util.php
index 7fb2c6c4b..8381bc63c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -134,7 +134,7 @@ function common_check_user($nickname, $password)
$authenticatedUser = false;
if (Event::handle('StartCheckPassword', array($nickname, $password, &$authenticatedUser))) {
- $user = User::staticGet('nickname', $nickname);
+ $user = User::staticGet('nickname', common_canonical_nickname($nickname));
if (!empty($user)) {
if (!empty($password)) { // never allow login with blank password
if (0 == strcmp(common_munge_password($password, $user->id),
@@ -1119,12 +1119,16 @@ function common_enqueue_notice($notice)
return true;
}
-function common_broadcast_profile($profile)
+/**
+ * Broadcast profile updates to OMB and other remote subscribers.
+ *
+ * Since this may be slow with a lot of subscribers or bad remote sites,
+ * this is run through the background queues if possible.
+ */
+function common_broadcast_profile(Profile $profile)
{
- // XXX: optionally use a queue system like http://code.google.com/p/microapps/wiki/NQDQ
- require_once(INSTALLDIR.'/lib/omb.php');
- omb_broadcast_profile($profile);
- // XXX: Other broadcasts...?
+ $qm = QueueManager::get();
+ $qm->enqueue($profile, "profile");
return true;
}
@@ -1602,6 +1606,7 @@ function common_database_tablename($tablename)
*/
function common_shorten_url($long_url)
{
+ $long_url = trim($long_url);
$user = common_current_user();
if (empty($user)) {
// common current user does not find a user when called from the XMPP daemon
@@ -1616,7 +1621,7 @@ function common_shorten_url($long_url)
return $long_url;
}else{
//URL was shortened, so return the result
- return $shortenedUrl;
+ return trim($shortenedUrl);
}
}
@@ -1693,7 +1698,8 @@ function common_url_to_nickname($url)
# Strip starting, ending slashes
$path = preg_replace('@/$@', '', $parts['path']);
$path = preg_replace('@^/@', '', $path);
- if (strpos($path, '/') === false) {
+ $path = basename($path);
+ if ($path) {
return common_nicknamize($path);
}
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 4e63e3e33..26f956329 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,18 +9,70 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:40+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:01+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Ù†ÙØ§Ø°"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "إعدادات الوصول إلى الموقع"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "تسجيل"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "خاص"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "بالدعوة Ùقط"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Ù…ÙØºÙ„Ù‚"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "عطّل التسجيل الجديد."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "أرسل"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Ø­ÙØ¸ إعدادت الوصول"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +87,29 @@ msgstr "لا ØµÙØ­Ø© كهذه"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "لا مستخدم كهذا."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s والأصدقاء, Ø§Ù„ØµÙØ­Ø© %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -94,7 +150,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -105,8 +161,8 @@ msgstr ""
msgid "You and friends"
msgstr "أنت والأصدقاء"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -116,23 +172,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "لم يتم العثور على وسيلة API."
@@ -146,7 +202,7 @@ msgstr "لم يتم العثور على وسيلة API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقة POST."
@@ -175,8 +231,9 @@ msgstr "لم يمكن Ø­ÙØ¸ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -219,7 +276,7 @@ msgstr "رسائل مباشرة من %s"
#: actions/apidirectmessage.php:93
#, php-format
msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "جميع الرسائل المرسلة من %s"
#: actions/apidirectmessage.php:101
#, php-format
@@ -254,18 +311,16 @@ msgid "No status found with that ID."
msgstr ""
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "هذا الإشعار Ù…ÙØ¶Ù„Ø© مسبقًا!"
+msgstr "هذه الحالة Ù…ÙØ¶Ù„Ø© Ø¨Ø§Ù„ÙØ¹Ù„."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "تعذّر إنشاء Ù…ÙØ¶Ù„Ø©."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "تلك الحالة ليست Ù…ÙØ¶Ù„Ø©!"
+msgstr "تلك الحالة ليست Ù…ÙØ¶Ù„Ø©."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -285,19 +340,18 @@ msgid "Could not unfollow user: User not found."
msgstr ""
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "لا يمكنك منع Ù†ÙØ³Ùƒ!"
+msgstr "لا يمكنك عدم متابعة Ù†ÙØ³Ùƒ."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
-msgstr ""
+msgstr "تعذّر تحديد المستخدم المصدر."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدÙ."
@@ -311,7 +365,7 @@ msgstr ""
#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
-msgstr ""
+msgstr "الاسم المستعار مستخدم Ø¨Ø§Ù„ÙØ¹Ù„. جرّب اسمًا آخرًا."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
#: actions/newgroup.php:133 actions/profilesettings.php:218
@@ -319,7 +373,8 @@ msgstr ""
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -331,7 +386,8 @@ msgstr "Ø§Ù„ØµÙØ­Ø© الرئيسية ليست عنونًا صالحًا."
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرÙًا)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
@@ -346,7 +402,7 @@ msgstr ""
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "كنيات كيرة! العدد الأقصى هو %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
@@ -367,7 +423,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "لم توجد المجموعة!"
@@ -380,18 +436,18 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
-msgstr ""
+msgstr "لست عضوًا ÙÙŠ هذه المجموعة"
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -408,6 +464,113 @@ msgstr "مجموعات %s"
msgid "groups on %s"
msgstr "مجموعات %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "حجم غير صالح."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "اسم/كلمة سر غير صحيحة!"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "خطأ قاعدة البيانات أثناء حذ٠المستخدم OAuth app"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "الحساب"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "الاسم المستعار"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "كلمة السر"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Ø§Ø±ÙØ¶"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "اسمح"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -435,19 +598,19 @@ msgstr "Ø­ÙØ°ÙÙØª الحالة."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr ""
+msgstr "لا حالة ÙˆÙØ¬Ø¯Øª بهذه الهوية."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "لم يوجد"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -461,7 +624,7 @@ msgstr "نسق غير مدعوم."
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -472,7 +635,7 @@ msgstr ""
msgid "%s timeline"
msgstr "مسار %s الزمني"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -488,27 +651,22 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمني العام"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "كرر إلى %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "تكرارات %s"
@@ -518,7 +676,7 @@ msgstr "تكرارات %s"
msgid "Notices tagged with %s"
msgstr "الإشعارات الموسومة ب%s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -578,8 +736,8 @@ msgstr "الأصلي"
msgid "Preview"
msgstr "عاين"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "احذÙ"
@@ -591,29 +749,6 @@ msgstr "Ø§Ø±ÙØ¹"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -649,8 +784,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "لا"
@@ -658,13 +794,13 @@ msgstr "لا"
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "نعم"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
@@ -688,9 +824,9 @@ msgid "%s blocked profiles"
msgstr ""
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "مشتركو %sØŒ Ø§Ù„ØµÙØ­Ø© %d"
+msgstr "%1$s Ù…Ù„ÙØ§Øª ممنوعة, Ø§Ù„ØµÙØ­Ø© %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -747,8 +883,8 @@ msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذ٠تأكيد البريد الإلكتروني."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "عنوان التأكيد"
+msgid "Confirm address"
+msgstr "أكد العنوان"
#: actions/confirmaddress.php:159
#, php-format
@@ -764,10 +900,53 @@ msgstr "محادثة"
msgid "Notices"
msgstr "الإشعارات"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "لم يوجد رمز التأكيد."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "أنت لست مالك هذا التطبيق."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "عدّل التطبيق"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "لا تحذ٠هذا الإشعار"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "احذ٠هذا الإشعار"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -796,7 +975,7 @@ msgstr "أمتأكد من أنك تريد حذ٠هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذ٠هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "احذ٠هذا الإشعار"
@@ -924,16 +1103,6 @@ msgstr "استعد التصميمات المبدئية"
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "أرسل"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Ø§Ø­ÙØ¸ التصميم"
@@ -946,10 +1115,77 @@ msgstr "هذا الشعار ليس Ù…ÙØ¶Ù„ًا!"
msgid "Add to favorites"
msgstr "أض٠إلى Ø§Ù„Ù…ÙØ¶Ù„ات"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "لا مستند كهذا."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "عدّل التطبيق"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "لا تطبيق كهذا."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "استخدم هذا النموذج لتعدل تطبيقك."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "الاسم مطلوب."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "الاسم طويل جدا (الأقصى 255 Ø­Ø±ÙØ§)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr ""
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "الوص٠مطلوب."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "مسار المصدر ليس صحيحا."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "المنظمة مطلوبة."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "المنظمة طويلة جدا (الأقصى 255 Ø­Ø±ÙØ§)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "ØµÙØ­Ø© المنظمة الرئيسية مطلوبة."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "لم يمكن تحديث التطبيق."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -961,9 +1197,8 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعة."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "يجب أن تكون إداريًا لتعدّل المجموعة"
+msgstr "يجب أن تكون إداريا لتعدل المجموعة."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -978,7 +1213,7 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعة."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
@@ -987,7 +1222,6 @@ msgid "Options saved."
msgstr "Ø­ÙÙØ¸Øª الخيارات."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "إعدادات البريد الإلكتروني"
@@ -1018,14 +1252,14 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "ألغÙ"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "عناوين البريد الإلكتروني"
+msgstr "عنوان البريد الإلكتروني"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1099,7 +1333,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1111,7 +1345,7 @@ msgstr "هذا هو عنوان بريدك الإكتروني سابقًا."
msgid "That email address already belongs to another user."
msgstr "هذا البريد الإلكتروني ملك مستخدم آخر Ø¨Ø§Ù„ÙØ¹Ù„."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "تعذّر إدراج رمز التأكيد."
@@ -1147,7 +1381,7 @@ msgstr "أزيل هذا العنوان."
#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
-msgstr ""
+msgstr "لا عنوان بريد إلكتروني وارد."
#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
@@ -1170,7 +1404,7 @@ msgstr "هذا الإشعار Ù…ÙØ¶Ù„Ø© مسبقًا!"
msgid "Disfavor favorite"
msgstr "Ø£Ù„ØºÙ ØªÙØ¶ÙŠÙ„ Ø§Ù„Ù…ÙØ¶Ù„Ø©"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "إشعارات مشهورة"
@@ -1253,7 +1487,7 @@ msgstr "المستخدم الذي تستمع إليه غير موجود."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr ""
+msgstr "تستطيع استخدام الاشتراك المحلي!"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
@@ -1312,7 +1546,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr "المستخدم ليس عضوًا ÙÙŠ المجموعة."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "امنع المستخدم من المجموعة"
@@ -1374,9 +1608,8 @@ msgid ""
msgstr ""
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "ليس للمستخدم مل٠شخصي."
+msgstr "المستخدم بدون مل٠مطابق."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1396,31 +1629,31 @@ msgid "%s group members"
msgstr "أعضاء مجموعة %s"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "مجموعات %sØŒ ØµÙØ­Ø© %d"
+msgstr "%1$s أعضاء المجموعة, Ø§Ù„ØµÙØ­Ø© %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "قائمة بمستخدمي هذه المجموعة."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "امنع"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "اجعل هذا المستخدم إداريًا"
@@ -1496,7 +1729,6 @@ msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "إعدادات المراسلة الÙورية"
@@ -1523,7 +1755,6 @@ msgid ""
msgstr ""
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "عنوان المراسلة الÙورية"
@@ -1581,6 +1812,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "هذه ليست هويتك ÙÙŠ جابر."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1657,7 +1893,7 @@ msgstr "رسالة شخصية"
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "أرسل"
@@ -1699,25 +1935,25 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "يجب أن تلج لتنضم إلى مجموعة."
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s انضم إلى مجموعة %s"
+msgstr "%1$s انضم للمجموعة %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "يجب أن تلج لتغادر مجموعة."
#: actions/leavegroup.php:90 lib/command.php:265
msgid "You are not a member of that group."
msgstr "لست عضوا ÙÙŠ تلك المجموعة."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s انضم إلى مجموعة %s"
+msgstr "%1$s ترك المجموعة %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1731,7 +1967,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست Ù…ÙØµØ±Ø­Ù‹Ø§ على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ù„ÙØ¬"
@@ -1740,17 +1976,6 @@ msgstr "Ù„ÙØ¬"
msgid "Login to site"
msgstr "Ù„ÙØ¬ إلى الموقع"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "الاسم المستعار"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "كلمة السر"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "تذكّرني"
@@ -1776,29 +2001,50 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
-#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#: actions/makeadmin.php:133
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن الحصول على تسجيل العضوية Ù„%1$s ÙÙŠ المجموعة %2$s."
-#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#: actions/makeadmin.php:146
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "لا حالة حالية"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "تطبيق جديد"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "لم يمكن إنشاء التطبيق."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "مجموعة جديدة"
@@ -1813,7 +2059,7 @@ msgstr "رسالة جديدة"
#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
msgid "You can't send a message to this user."
-msgstr ""
+msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
#: lib/command.php:475
@@ -1834,9 +2080,9 @@ msgid "Message sent"
msgstr "Ø£ÙØ±Ø³Ù„ت الرسالة"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "رسالة مباشرة %s"
+msgstr "رسالة مباشرة ل%s تم إرسالها."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1856,15 +2102,17 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
+"ابحث عن إشعارات على %%site.name%% عبر محتوياتها. Ø§ÙØµÙ„ عبارات البحث Ø¨Ù…Ø³Ø§ÙØ§ØªØ› "
+"ويجب أن تتكون هذه العبارات من 3 أحر٠أو أكثر."
#: actions/noticesearch.php:78
msgid "Text search"
msgstr "بحث ÙÙŠ النصوص"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "نتائج البحث عن \"%s\" ÙÙŠ %s"
+msgstr "نتائج البحث ل\"%1$s\" على %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -1903,6 +2151,48 @@ msgstr "أرسل التنبيه"
msgid "Nudge sent!"
msgstr "Ø£ÙØ±Ø³Ù„ التنبيه!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "يجب أن تكون مسجل الدخول لعرض تطبيقاتك."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "تطبيقات OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "لست مستخدما لهذا التطبيق."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr ""
@@ -1910,7 +2200,7 @@ msgstr ""
#: actions/oembed.php:86 actions/shownotice.php:180
#, php-format
msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "حالة %1$s ÙÙŠ يوم %2$s"
#: actions/oembed.php:157
msgid "content type "
@@ -1920,8 +2210,8 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -1934,7 +2224,7 @@ msgid "Notice Search"
msgstr "بحث الإشعارات"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "إعدادات أخرى"
#: actions/othersettings.php:71
@@ -1966,29 +2256,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "لا مجموعة Ù…ÙØ­Ø¯Ù‘دة."
+msgstr "لا هوية مستخدم محددة."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "لا ملاحظة محددة."
+msgstr "لا محتوى دخول محدد."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "لا طلب استيثاق!"
+msgstr "لا طلب استيثاق."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "لا ملاحظة محددة."
+msgstr "توكن دخول غير صحيح محدد."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ù„ÙØ¬ إلى الموقع"
+msgstr "توكن الدخول انتهى."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
#: actions/outbox.php:61
#, php-format
@@ -2060,7 +2350,7 @@ msgstr "تعذّر Ø­ÙØ¸ كلمة السر الجديدة."
msgid "Password saved."
msgstr "Ø­ÙÙØ¸Øª كلمة السر."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "المسارات"
@@ -2068,133 +2358,148 @@ msgstr "المسارات"
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "لا يمكن قراءة دليل السمات: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "لا يمكن الكتابة ÙÙŠ دليل Ø§Ù„Ø£ÙØªØ§Ø±Ø§Øª: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "لا يمكن الكتابة ÙÙŠ دليل الخلÙيات: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "لا يمكن قراءة دليل المحليات: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "الموقع"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "خادوم"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "اسم مضي٠خادوم الموقع."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "المسار"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "مسار الموقع"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "مسار المحليات"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "مسار دليل المحليات"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "مسارات ÙØ§Ø®Ø±Ø©"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "أأستخدم مسارات ÙØ§Ø®Ø±Ø© (يمكن قراءتها وتذكرها بسهولة أكبر)ØŸ"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "السمة"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "خادوم السمات"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "مسار السمات"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Ø£ÙØªØ§Ø±Ø§Øª"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "خادوم Ø§Ù„Ø£ÙØªØ§Ø±Ø§Øª"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "مسار Ø§Ù„Ø£ÙØªØ§Ø±Ø§Øª"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "دليل Ø§Ù„Ø£ÙØªØ§Ø±."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "خلÙيات"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "خادوم الخلÙيات"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "مسار الخلÙيات"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "دليل الخلÙيات"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "مطلقا"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "أحيانًا"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "دائمًا"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "استخدم SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
-msgstr "خادوم SSL"
+msgstr "خادم SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Ø§Ø­ÙØ¸ المسارات"
@@ -2235,7 +2540,7 @@ msgstr "إعدادات المل٠الشخصي"
#: actions/profilesettings.php:71
msgid ""
"You can update your personal profile info here so people know more about you."
-msgstr ""
+msgstr "بإمكانك تحديث بيانات ملÙÙƒ الشخصي ليعر٠عنك الناس أكثر."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2252,18 +2557,18 @@ msgid "Full name"
msgstr "الاسم الكامل"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Ø§Ù„ØµÙØ­Ø© الرئيسية"
#: actions/profilesettings.php:117 actions/register.php:455
msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+msgstr "مسار ØµÙØ­ØªÙƒ الرئيسية أو مدونتك أو ملÙÙƒ الشخصي على موقع آخر"
#: actions/profilesettings.php:122 actions/register.php:461
#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+msgstr "تكلم عن Ù†ÙØ³Ùƒ واهتمامتك ÙÙŠ %d حرÙ"
#: actions/profilesettings.php:125 actions/register.php:464
msgid "Describe yourself and your interests"
@@ -2275,18 +2580,18 @@ msgstr "السيرة"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "الموقع"
#: actions/profilesettings.php:134 actions/register.php:473
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "شارك مكاني الحالي عند إرسال إشعارات"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2298,8 +2603,9 @@ msgstr "الوسوم"
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"سÙÙ… Ù†ÙØ³Ùƒ (حرو٠وأرقام Ùˆ \"-\" Ùˆ \".\" Ùˆ \"_\")ØŒ Ø§ÙØµÙ„ها Ø¨ÙØ§ØµÙ„Ø© (',') أو Ù…Ø³Ø§ÙØ©."
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "اللغة"
@@ -2318,14 +2624,14 @@ msgstr "ما المنطقة الزمنية التي تتواجد Ùيها عاد
#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+msgstr "اشترك تلقائيًا بأي شخص يشترك بي (ÙŠÙØ¶Ù„ أن يستخدم لغير البشر)"
#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "لم ØªÙØ®ØªØ± المنطقة الزمنية."
@@ -2338,23 +2644,23 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "لم يمكن Ø­ÙØ¸ ØªÙØ¶ÙŠÙ„ات الموقع."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "تعذّر Ø­ÙØ¸ المل٠الشخصي."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "تعذّر Ø­ÙØ¸ الوسوم."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Ø­ÙÙØ¸Øª الإعدادات."
@@ -2376,36 +2682,36 @@ msgstr "المسار الزمني العام، ØµÙØ­Ø© %d"
msgid "Public timeline"
msgstr "المسار الزمني العام"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr ""
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "كن أول من ÙŠÙØ±Ø³Ù„!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2418,7 +2724,7 @@ msgstr ""
"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
"([اقرأ المزيد](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2453,7 +2759,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "سحابة الوسوم"
@@ -2589,7 +2895,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -2629,7 +2935,7 @@ msgid "Same as password above. Required."
msgstr "Ù†ÙØ³ كلمة السر أعلاه. مطلوب."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "البريد الإلكتروني"
@@ -2713,7 +3019,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "اشترك"
@@ -2735,7 +3041,7 @@ msgstr ""
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
@@ -2749,7 +3055,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
msgid "You already repeated that notice."
msgstr "أنت كررت هذه الملاحظة Ø¨Ø§Ù„ÙØ¹Ù„."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "مكرر"
@@ -2763,6 +3069,11 @@ msgstr "مكرر!"
msgid "Replies to %s"
msgstr "الردود على %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "الردود على %s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2804,6 +3115,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "ستاتس نت"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2812,6 +3127,121 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "الجلسات"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "الإعدادات الأساسية لموقع StatusNet هذا."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "تنقيح الجلسة"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "مكّن تنقيح Ù…ÙØ®Ø±Ø¬Ø§Øª الجلسة."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "اذ٠إعدادت الموقع"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "أيقونة"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "الاسم"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "المنظمة"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "الوصÙ"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "اسمح بالمسار"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "أمتأكد من أنك تريد حذ٠هذا الإشعار؟"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "إشعارات %s المÙÙØ¶Ù„Ø©"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2865,17 +3295,22 @@ msgstr "إنها إحدى وسائل مشاركة ما تحب."
msgid "%s group"
msgstr "مجموعة %s"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s أعضاء المجموعة, Ø§Ù„ØµÙØ­Ø© %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "مل٠المجموعة الشخصي"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "مسار"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "ملاحظة"
@@ -2921,10 +3356,6 @@ msgstr "(لا شيء)"
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "إحصاءات"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "أنشئ"
@@ -2979,6 +3410,11 @@ msgstr "Ø­ÙØ°Ù الإشعار."
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s والأصدقاء, Ø§Ù„ØµÙØ­Ø© %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3004,25 +3440,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3031,7 +3467,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3039,10 +3475,10 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
-msgstr "تكرارات %s"
+msgstr "تكرار ل%s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3056,198 +3492,144 @@ msgstr "المستخدم مسكت من قبل."
msgid "Basic settings for this StatusNet site."
msgstr "الإعدادات الأساسية لموقع StatusNet هذا."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "يجب ألا يكون طول اسم الموقع ØµÙØ±Ù‹Ø§."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
-msgstr "يجب أن تملك عنوان بريد إلكتروني صالح للاتصال"
+msgstr "يجب أن تملك عنوان بريد إلكتروني صحيح."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "لغة غير Ù…Ø¹Ø±ÙˆÙØ© \"%s\""
+msgstr "لغة غير Ù…Ø¹Ø±ÙˆÙØ© \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "حد النص الأدنى هو 140 حرÙًا."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "عام"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "اسم الموقع"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "عنوان البريد الإلكتروني للاتصال بموقعك"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "محلي"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "المنطقة الزمنية المبدئية"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "المنطقة الزمنية المبدئية للموقع؛ ت‌ع‌م عادة."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "لغة الموقع المبدئية"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "مسارات"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "خادوم"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "اسم مضي٠خادوم الموقع."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "مسارات ÙØ§Ø®Ø±Ø©"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "أأستخدم مسارات ÙØ§Ø®Ø±Ø© (يمكن قراءتها وتذكرها بسهولة أكبر)ØŸ"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Ù†ÙØ§Ø°"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "خاص"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "بالدعوة Ùقط"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Ù…ÙØºÙ„Ù‚"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "عطّل التسجيل الجديد."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "ÙÙŠ مهمة Ù…ÙØ¬Ø¯ÙˆÙ„Ø©"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "التكرار"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "بلّغ عن المسار"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "الحدود"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "حد النص"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "أقصى عدد للحرو٠ÙÙŠ الإشعارات."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "اذ٠إعدادت الموقع"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
@@ -3277,9 +3659,8 @@ msgid "Enter the code you received on your phone."
msgstr ""
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
-msgstr "لا رقم هاتÙ."
+msgstr "رقم هات٠SMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3344,15 +3725,25 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "تعذّر Ø­ÙØ¸ الاشتراك."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ليس Ù…ÙØ³ØªØ®Ø¯Ù…ًا محليًا."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "لا مل٠كهذا."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Ù…ÙØ´ØªØ±Ùƒ"
@@ -3362,9 +3753,9 @@ msgid "%s subscribers"
msgstr "مشتركو %s"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "مشتركو %sØŒ Ø§Ù„ØµÙØ­Ø© %d"
+msgstr "مشتركو %1$s, Ø§Ù„ØµÙØ­Ø© %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3399,9 +3790,9 @@ msgid "%s subscriptions"
msgstr "اشتراكات %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "اشتراكات %sØŒ Ø§Ù„ØµÙØ­Ø© %d"
+msgstr "اشتراكات%1$s, Ø§Ù„ØµÙØ­Ø© %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -3412,7 +3803,7 @@ msgstr "هؤلاء الأشخاص الذي تستمع إليهم."
msgid "These are the people whose notices %s listens to."
msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3422,19 +3813,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "جابر"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "رسائل قصيرة"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "الإشعارات الموسومة ب%s"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3463,7 +3859,8 @@ msgstr ""
msgid "User profile"
msgstr "مل٠المستخدم الشخصي"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "صورة"
@@ -3518,7 +3915,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr ""
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3533,84 +3930,64 @@ msgstr "المستخدم"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرÙ."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "المل٠الشخصي"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "حد السيرة"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "مستخدمون جدد"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "ترحيب المستخدمين الجدد"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "نص الترحيب بالمستخدمين الجدد (255 حرÙًا كحد أقصى)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "الاشتراك المبدئي"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "الدعوات"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "الدعوات Ù…ÙÙØ¹Ù„Ø©"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "الجلسات"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "تنقيح الجلسة"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "مكّن تنقيح Ù…ÙØ®Ø±Ø¬Ø§Øª الجلسة."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3622,84 +3999,84 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "الرخصة"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "اقبل"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "اشترك بهذا المستخدم"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Ø§Ø±ÙØ¶"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Ø§Ø±ÙØ¶ هذا الاشتراك"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "لا طلب استيثاق!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "رÙÙØ¶ الاشتراك"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr ""
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3718,9 +4095,14 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "استمتع بالنقانق!"
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s أعضاء المجموعة, Ø§Ù„ØµÙØ­Ø© %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
-msgstr ""
+msgstr "ابحث عن المزيد من المجموعات"
#: actions/usergroups.php:153
#, php-format
@@ -3733,9 +4115,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "إحصاءات"
+msgstr "ستاتس نت %s"
#: actions/version.php:153
#, php-format
@@ -3744,11 +4126,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Ø­ÙØ°ÙÙØª الحالة."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3778,26 +4155,15 @@ msgstr ""
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
-
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "الاسم المستعار"
+msgstr "ملحقات"
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "الجلسات"
+msgstr "النسخة"
#: actions/version.php:197
-#, fuzzy
msgid "Author(s)"
-msgstr "المؤلÙ"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "الوصÙ"
+msgstr "المؤلÙ(ون)"
#: classes/File.php:144
#, php-format
@@ -3817,19 +4183,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "مل٠المجموعة الشخصي"
+msgstr "الانضمام للمجموعة ÙØ´Ù„."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "تعذر تحديث المجموعة."
+msgstr "ليس جزءا من المجموعة."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "مل٠المجموعة الشخصي"
+msgstr "ترك المجموعة ÙØ´Ù„."
#: classes/Login_token.php:76
#, php-format
@@ -3848,58 +4211,82 @@ msgstr "تعذّر إدراج الرسالة."
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "مشكلة ÙÙŠ Ø­ÙØ¸ الإشعار. طويل جدًا."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "مشكلة ÙÙŠ Ø­ÙØ¸ الإشعار. مستخدم غير معروÙ."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "مشكلة أثناء Ø­ÙØ¸ الإشعار."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "مشكلة أثناء Ø­ÙØ¸ الإشعار."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Ù…ÙØ´ØªØ±Ùƒ أصلا!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "لقد منعك المستخدم."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "غير مشترك!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "لم يمكن حذ٠اشتراك ذاتي."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذ٠الاشتراك."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم ÙÙŠ %1$s يا @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "تعذّر إنشاء المجموعة."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "تعذّر ضبط عضوية المجموعة."
@@ -3932,136 +4319,132 @@ msgid "Other options"
msgstr "خيارات أخرى"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "ØµÙØ­Ø© غير Ù…ÙØ¹Ù†ÙˆÙ†Ø©"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "المل٠الشخصي ومسار الأصدقاء الزمني"
-#: lib/action.php:435
-msgid "Account"
-msgstr "الحساب"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعÙ"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ù„ÙØ¬ إلى الموقع"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "إشعار Ø§Ù„ØµÙØ­Ø©"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "عن"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "الأسئلة المكررة"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
-msgstr ""
+msgstr "رخصة برنامج StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4070,12 +4453,12 @@ msgstr ""
"**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4086,32 +4469,54 @@ msgstr ""
"Ø§Ù„Ù…ØªÙˆÙØ± تحت [رخصة غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "بعد"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4119,9 +4524,8 @@ msgid "You cannot make changes to this site."
msgstr ""
#: lib/adminpanelaction.php:107
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "لا ÙŠÙØ³Ù…Ø­ بالتسجيل."
+msgstr "التغييرات لهذه اللوحة غير مسموح بها."
#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
@@ -4143,10 +4547,99 @@ msgstr "ضبط الموقع الأساسي"
msgid "Design configuration"
msgstr "ضبط التصميم"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "ضبط المسارات"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "ضبط التصميم"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "ضبط المسارات"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "ضبط التصميم"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "عدّل التطبيق"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr ""
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "ص٠تطبيقك"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "مسار المصدر"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "اسحب"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "مرÙقات"
@@ -4167,15 +4660,13 @@ msgstr ""
msgid "Tags for this attachment"
msgstr "وسوم هذا المرÙÙ‚"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
-#, fuzzy
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
-msgstr "تغيير كلمة السر"
+msgstr "تغيير كلمة السر ÙØ´Ù„"
-#: lib/authenticationplugin.php:197
-#, fuzzy
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
-msgstr "تغيير كلمة السر"
+msgstr "تغيير كلمة السر غير مسموح به"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
@@ -4194,18 +4685,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "تعذّر إيجاد المستخدم الهدÙ."
+msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "أرسل التنبيه"
+msgstr "التنبيه تم إرساله إلى %s"
#: lib/command.php:126
#, php-format
@@ -4219,9 +4710,8 @@ msgstr ""
"الإشعارات: %3$s"
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "لا مل٠بهذه الهوية."
+msgstr "الملاحظة بهذا الرقم غير موجودة"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
@@ -4233,14 +4723,13 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "لست عضوا ÙÙŠ تلك المجموعة."
+msgstr "أنت Ø¨Ø§Ù„ÙØ¹Ù„ عضو ÙÙŠ هذه المجموعة"
#: lib/command.php:231
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s"
#: lib/command.php:236
#, php-format
@@ -4248,14 +4737,14 @@ msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعة %s"
#: lib/command.php:275
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s"
#: lib/command.php:280
-#, fuzzy, php-format
+#, php-format
msgid "%s left group %s"
-msgstr "%s انضم إلى مجموعة %s"
+msgstr "%s ترك المجموعة %s"
#: lib/command.php:309
#, php-format
@@ -4283,18 +4772,17 @@ msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:367
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent"
-msgstr "رسالة مباشرة %s"
+msgstr "رسالة مباشرة إلى %s تم إرسالها"
#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
+msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
#: lib/command.php:418
msgid "Already repeated that notice"
@@ -4327,54 +4815,64 @@ msgstr "خطأ أثناء Ø­ÙØ¸ الإشعار."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "لا مستخدم كهذا."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Ù…ÙØ´ØªØ±Ùƒ ب%s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ألغ٠الاشتراك"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "لست Ù…ÙØ´ØªØ±ÙƒÙ‹Ø§ بأي أحد."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4384,11 +4882,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4398,11 +4896,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "لست عضوًا ÙÙŠ أي مجموعة."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا ÙÙŠ أي مجموعة."
@@ -4412,7 +4910,7 @@ msgstr[3] "أنت عضو ÙÙŠ هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4426,6 +4924,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4453,19 +4952,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "اذهب إلى Ø§Ù„Ù…ÙØ«Ø¨Ù‘ت."
@@ -4481,6 +4980,14 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "اتصالات"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "خطأ قاعدة بيانات"
@@ -4607,7 +5114,7 @@ msgstr "أض٠أو عدّل شعار %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "أض٠أو عدل تصميم %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4620,7 +5127,7 @@ msgstr "المجموعات الأكثر مرسلات"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "وسوم ÙÙŠ إشعارات المجموعة %s"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
@@ -4663,15 +5170,15 @@ msgstr "ميجابايت"
msgid "kB"
msgstr "كيلوبايت"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "لغة غير Ù…Ø¹Ø±ÙˆÙØ© \"%s\""
+msgstr "مصدر صندوق وارد غير معرو٠%d."
#: lib/joinform.php:114
msgid "Join"
@@ -4713,7 +5220,7 @@ msgstr ""
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
#: lib/mail.php:241
#, php-format
@@ -4729,11 +5236,21 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s يستمع الآن إلى إشعاراتك على %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Ø¨ÙˆÙØ§Ø¡ØŒ\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"غيّر خيارات البريد الإلكتروني والإشعار ÙÙŠ %8$s\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr "السيرة: %s\n"
+msgstr "السيرة: %s"
#: lib/mail.php:286
#, php-format
@@ -4863,7 +5380,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "من"
@@ -4884,9 +5401,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "نسق غير مدعوم."
+msgstr "نوع رسالة غير مدعوم: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
@@ -4927,9 +5444,8 @@ msgid "File could not be moved to destination directory."
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "تعذّر Ø­Ø°Ù Ø§Ù„Ù…ÙØ¶Ù„Ø©."
+msgstr "لم يمكن تحديد نوع MIME للملÙ."
#: lib/mediafile.php:270
#, php-format
@@ -4971,67 +5487,61 @@ msgid "Attach a file"
msgstr "أرÙÙ‚ ملÙًا"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "لم يمكن Ø­ÙØ¸ ØªÙØ¶ÙŠÙ„ات الموقع."
+msgstr "شارك موقعي"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "لم يمكن Ø­ÙØ¸ ØªÙØ¶ÙŠÙ„ات الموقع."
+msgstr "لا تشارك موقعي"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Ø´"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ج"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "ر"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "غ"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "ÙÙŠ"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "ÙÙŠ السياق"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "مكرر بواسطة"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Ø±ÙØ¯ على هذا الإشعار"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Ø±ÙØ¯"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -5063,11 +5573,7 @@ msgstr "خطأ أثناء إدراج المل٠الشخصي البعيد"
msgid "Duplicate notice"
msgstr "ضاع٠الإشعار"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "تعذّر إدراج اشتراك جديد."
@@ -5083,31 +5589,30 @@ msgstr "الردود"
msgid "Favorites"
msgstr "Ø§Ù„Ù…ÙØ¶Ù„ات"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "صندوق الوارد"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "رسائلك الواردة"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "صندوق الصادر"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "رسائلك Ø§Ù„Ù…ÙØ±Ø³Ù„Ø©"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "وسوم ÙÙŠ إشعارات %s"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "إجراء غير معروÙ"
+msgstr "غير معروÙ"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -5167,11 +5672,15 @@ msgstr "مشهورة"
#: lib/repeatform.php:107
msgid "Repeat this notice?"
-msgstr "كرر هذا الإشعار؟"
+msgstr "أأكرّر هذا الإشعار؟ّ"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr "كرر هذا الإشعار"
+msgstr "كرّر هذا الإشعار"
+
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -5240,34 +5749,6 @@ msgstr "الأشخاص المشتركون ب%s"
msgid "Groups %s is a member of"
msgstr "المجموعات التي %s عضو Ùيها"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Ù…ÙØ´ØªØ±Ùƒ أصلا!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "لقد منعك المستخدم."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "تعذّر الاشتراك."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "غير مشترك!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "لم يمكن حذ٠اشتراك ذاتي."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "تعذّر حذ٠الاشتراك."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5318,67 +5799,67 @@ msgstr "عدّل Ø§Ù„Ø£ÙØªØ§Ø±"
msgid "User actions"
msgstr "ØªØµØ±ÙØ§Øª المستخدم"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "عدّل إعدادات المل٠الشخصي"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "عدّل"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "رسالة"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
@@ -5392,7 +5873,7 @@ msgstr "%s ليس لونًا صحيحًا!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index fbdc01063..cd8640753 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -1,5 +1,7 @@
# Translation of StatusNet to Egyptian Spoken Arabic
#
+# Author@translatewiki.net: Dudi
+# Author@translatewiki.net: Ghaly
# Author@translatewiki.net: Meno25
# --
# This file is distributed under the same license as the StatusNet package.
@@ -8,18 +10,73 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:44+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:08+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Ù†ÙØ§Ø°"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "اذ٠إعدادت الموقع"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "سجّل"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "خاص"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "بالدعوه Ùقط"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Ù…ÙØºÙ„Ù‚"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "عطّل التسجيل الجديد."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "أرسل"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "اذ٠إعدادت الموقع"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +91,29 @@ msgstr "لا ØµÙØ­Ù‡ كهذه"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "لا مستخدم كهذا."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s Ùˆ الصحاب, ØµÙØ­Ù‡ %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -93,7 +154,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +165,8 @@ msgstr ""
msgid "You and friends"
msgstr "أنت والأصدقاء"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -115,25 +176,25 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
-msgstr "لم يتم العثور على وسيله API."
+msgstr "الـ API method مش موجوده."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofile.php:89
@@ -145,7 +206,7 @@ msgstr "لم يتم العثور على وسيله API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقه POST."
@@ -174,8 +235,9 @@ msgstr "لم يمكن Ø­ÙØ¸ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -200,7 +262,7 @@ msgstr "تعذّر تحديث تصميمك."
#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
-msgstr "لا يمكنك منع Ù†ÙØ³Ùƒ!"
+msgstr "ما ÙŠÙ†ÙØ¹Ø´ تمنع Ù†ÙØ³Ùƒ!"
#: actions/apiblockcreate.php:126
msgid "Block user failed."
@@ -253,18 +315,16 @@ msgid "No status found with that ID."
msgstr ""
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "هذا الإشعار Ù…ÙØ¶Ù„Ù‡ مسبقًا!"
+msgstr "الحاله دى موجوده ÙØ¹Ù„ا ÙÙ‰ Ø§Ù„ØªÙØ¶ÙŠÙ„ات."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "تعذّر إنشاء Ù…ÙØ¶Ù„Ù‡."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "تلك الحاله ليست Ù…ÙØ¶Ù„Ø©!"
+msgstr "الحاله دى مش محطوطه ÙÙ‰ Ø§Ù„ØªÙØ¶ÙŠÙ„ات."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -284,19 +344,18 @@ msgid "Could not unfollow user: User not found."
msgstr ""
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "لا يمكنك منع Ù†ÙØ³Ùƒ!"
+msgstr "ما ÙŠÙ†ÙØ¹Ø´ عدم متابعة Ù†ÙØ³Ùƒ."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr ""
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدÙ."
@@ -318,7 +377,8 @@ msgstr ""
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -330,7 +390,8 @@ msgstr "Ø§Ù„ØµÙØ­Ù‡ الرئيسيه ليست عنونًا صالحًا."
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرÙًا)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
@@ -366,7 +427,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "لم توجد المجموعة!"
@@ -379,18 +440,18 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "ما Ù†ÙØ¹Ø´ يضم %1$s للجروپ %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr ""
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "ما Ù†ÙØ¹Ø´ يتشال اليوزر %1$s من الجروپ %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -407,6 +468,113 @@ msgstr "مجموعات %s"
msgid "groups on %s"
msgstr "مجموعات %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "حجم غير صالح."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "نيكنيم / پاسوورد مش مظبوطه!"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "خطأ قاعده البيانات أثناء حذ٠المستخدم OAuth app"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "الحساب"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "الاسم المستعار"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "كلمه السر"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Ø§Ø±ÙØ¶"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "اسمح"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -422,11 +590,11 @@ msgstr "لا إشعار كهذا."
#: actions/apistatusesretweet.php:83
msgid "Cannot repeat your own notice."
-msgstr "لا يمكنك تكرار ملحوظتك الخاصه."
+msgstr "مش Ù†Ø§ÙØ¹Ù‡ تتكرر الملاحظتك بتاعتك."
#: actions/apistatusesretweet.php:91
msgid "Already repeated that notice."
-msgstr "كرر Ø¨Ø§Ù„ÙØ¹Ù„ هذه الملاحظه."
+msgstr "الملاحظه اتكررت ÙØ¹Ù„ا."
#: actions/apistatusesshow.php:138
msgid "Status deleted."
@@ -436,17 +604,17 @@ msgstr "Ø­ÙØ°ÙÙØª الحاله."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "لم يوجد"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -460,7 +628,7 @@ msgstr "نسق غير مدعوم."
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -471,7 +639,7 @@ msgstr ""
msgid "%s timeline"
msgstr "مسار %s الزمني"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -487,27 +655,22 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمنى العام"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "كرر إلى %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "تكرارات %s"
@@ -517,7 +680,7 @@ msgstr "تكرارات %s"
msgid "Notices tagged with %s"
msgstr "الإشعارات الموسومه ب%s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -577,8 +740,8 @@ msgstr "الأصلي"
msgid "Preview"
msgstr "عاين"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "احذÙ"
@@ -590,29 +753,6 @@ msgstr "Ø§Ø±ÙØ¹"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -648,8 +788,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "لا"
@@ -657,13 +798,13 @@ msgstr "لا"
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "نعم"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
@@ -687,9 +828,9 @@ msgid "%s blocked profiles"
msgstr ""
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "مشتركو %sØŒ Ø§Ù„ØµÙØ­Ù‡ %d"
+msgstr "%1$s ÙØ§ÙŠÙ„ات معمول ليها بلوك, Ø§Ù„ØµÙØ­Ù‡ %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -746,8 +887,8 @@ msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذ٠تأكيد البريد الإلكترونى."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "عنوان التأكيد"
+msgid "Confirm address"
+msgstr "اكد العنوان"
#: actions/confirmaddress.php:159
#, php-format
@@ -763,10 +904,53 @@ msgstr "محادثة"
msgid "Notices"
msgstr "الإشعارات"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "لم يوجد رمز التأكيد."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "انت مش بتملك الapplication دى."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "لا تطبيق كهذا."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "لا تحذ٠هذا الإشعار"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "احذ٠هذا الإشعار"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -795,7 +979,7 @@ msgstr "أمتأكد من أنك تريد حذ٠هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذ٠هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "احذ٠هذا الإشعار"
@@ -923,16 +1107,6 @@ msgstr "استعد التصميمات المبدئية"
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "أرسل"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Ø§Ø­ÙØ¸ التصميم"
@@ -945,10 +1119,77 @@ msgstr "هذا الشعار ليس Ù…ÙØ¶Ù„ًا!"
msgid "Add to favorites"
msgstr "أض٠إلى Ø§Ù„Ù…ÙØ¶Ù„ات"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "لا مستند كهذا."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "تطبيقات OAuth"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "ما Ùيش application زى كده."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "استعمل الÙورمه دى علشان تعدّل الapplication بتاعتك."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "الاسم مطلوب."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr ""
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "الوص٠مطلوب."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "الSource URL مش مظبوط."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "ما Ù†ÙØ¹Ø´ تحديث الapplication."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -960,9 +1201,8 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "يجب أن تكون إداريًا لتعدّل المجموعة"
+msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -977,7 +1217,7 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعه."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
@@ -986,9 +1226,8 @@ msgid "Options saved."
msgstr "Ø­ÙÙØ¸Øª الخيارات."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
-msgstr "إعدادات البريد الإلكتروني"
+msgstr "تظبيطات الايميل"
#: actions/emailsettings.php:71
#, php-format
@@ -1017,14 +1256,14 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "ألغÙ"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "عناوين البريد الإلكتروني"
+msgstr "عنوان الايميل"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1098,7 +1337,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1110,7 +1349,7 @@ msgstr "هذا هو عنوان بريدك الإكترونى سابقًا."
msgid "That email address already belongs to another user."
msgstr "هذا البريد الإلكترونى ملك مستخدم آخر Ø¨Ø§Ù„ÙØ¹Ù„."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "تعذّر إدراج رمز التأكيد."
@@ -1169,7 +1408,7 @@ msgstr "هذا الإشعار Ù…ÙØ¶Ù„Ù‡ مسبقًا!"
msgid "Disfavor favorite"
msgstr "Ø£Ù„ØºÙ ØªÙØ¶ÙŠÙ„ Ø§Ù„Ù…ÙØ¶Ù„Ø©"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "إشعارات مشهورة"
@@ -1228,11 +1467,11 @@ msgstr "اختيار لبعض المستخدمين المتميزين على %s"
#: actions/file.php:34
msgid "No notice ID."
-msgstr "لا رقم ملاحظه."
+msgstr "ما Ùيش ملاحظة ID."
#: actions/file.php:38
msgid "No notice."
-msgstr "لا ملاحظه."
+msgstr "ما Ùيش ملاحظه."
#: actions/file.php:42
msgid "No attachments."
@@ -1240,7 +1479,7 @@ msgstr "لا مرÙقات."
#: actions/file.php:51
msgid "No uploaded attachments."
-msgstr "لا مرÙقات مرÙوعه."
+msgstr "ما Ùيش ÙØ§ÙŠÙ„ات اتعمللها upload."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
@@ -1311,7 +1550,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr "المستخدم ليس عضوًا ÙÙ‰ المجموعه."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "امنع المستخدم من المجموعة"
@@ -1373,9 +1612,8 @@ msgid ""
msgstr ""
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "ليس للمستخدم مل٠شخصى."
+msgstr "يوزر من-غير Ù¾Ø±ÙˆÙØ§ÙŠÙ„ زيّه."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1395,31 +1633,31 @@ msgid "%s group members"
msgstr "أعضاء مجموعه %s"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "مجموعات %sØŒ ØµÙØ­Ù‡ %d"
+msgstr "%1$s اعضاء الجروپ, ØµÙØ­Ù‡ %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "قائمه بمستخدمى هذه المجموعه."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "امنع"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "اجعل هذا المستخدم إداريًا"
@@ -1495,9 +1733,8 @@ msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
-msgstr "إعدادات المراسله الÙورية"
+msgstr "تظبيطات بعت الرسايل الÙوريه"
#: actions/imsettings.php:70
#, php-format
@@ -1522,9 +1759,8 @@ msgid ""
msgstr ""
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
-msgstr "عنوان المراسله الÙورية"
+msgstr "عنوان الرساله الÙوريه"
#: actions/imsettings.php:126
#, php-format
@@ -1580,6 +1816,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "هذه ليست هويتك ÙÙ‰ جابر."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1656,7 +1897,7 @@ msgstr "رساله شخصية"
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "أرسل"
@@ -1701,9 +1942,9 @@ msgid "You must be logged in to join a group."
msgstr ""
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s انضم إلى مجموعه %s"
+msgstr "%1$s دخل جروپ %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -1714,9 +1955,9 @@ msgid "You are not a member of that group."
msgstr "لست عضوا ÙÙ‰ تلك المجموعه."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s انضم إلى مجموعه %s"
+msgstr "%1$s ساب جروپ %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1730,7 +1971,7 @@ msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست Ù…ÙØµØ±Ø­Ù‹Ø§ على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ù„ÙØ¬"
@@ -1739,17 +1980,6 @@ msgstr "Ù„ÙØ¬"
msgid "Login to site"
msgstr "Ù„ÙØ¬ إلى الموقع"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "الاسم المستعار"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "كلمه السر"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "تذكّرني"
@@ -1775,29 +2005,50 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
-#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#: actions/makeadmin.php:133
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "مش Ù†Ø§ÙØ¹ يتجاب سجل العضويه لـ%1$s ÙÙ‰ جروپ %2$s."
-#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#: actions/makeadmin.php:146
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "%1$s مش Ù†Ø§ÙØ¹ يبقى ادارى لجروپ %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "لا حاله حالية"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "لا تطبيق كهذا."
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "استعمل الÙورمه دى علشان تسجل application جديد."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "مش ممكن إنشاء الapplication."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "مجموعه جديدة"
@@ -1833,9 +2084,9 @@ msgid "Message sent"
msgstr "Ø£ÙØ±Ø³Ù„ت الرسالة"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "رساله مباشره %s"
+msgstr "رساله مباشره اتبعتت لـ%s."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1861,9 +2112,9 @@ msgid "Text search"
msgstr "بحث ÙÙ‰ النصوص"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "نتائج البحث عن \"%s\" ÙÙ‰ %s"
+msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -1902,6 +2153,48 @@ msgstr "أرسل التنبيه"
msgid "Nudge sent!"
msgstr "Ø£ÙØ±Ø³Ù„ التنبيه!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "لازم تكون مسجل دخولك علشان تشو٠ليستة الapplications بتاعتك."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth applications"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "انت مش يوزر للapplication دى."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr ""
@@ -1919,22 +2212,22 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
-msgstr "ليس نسق بيانات مدعوم."
+msgstr " مش نظام بيانات مدعوم."
#: actions/opensearch.php:64
msgid "People Search"
-msgstr "بحث ÙÙ‰ الأشخاص"
+msgstr "تدوير ÙÙ‰ الأشخاص"
#: actions/opensearch.php:67
msgid "Notice Search"
msgstr "بحث الإشعارات"
#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "إعدادات أخرى"
+msgid "Other settings"
+msgstr "تظبيطات تانيه"
#: actions/othersettings.php:71
msgid "Manage various other options."
@@ -1965,29 +2258,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "لا مجموعه Ù…ÙØ­Ø¯Ù‘ده."
+msgstr "ما Ùيش ID متحدد لليوزر."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "لا ملاحظه محدده."
+msgstr "ما Ùيش امارة دخول متحدده."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "لا طلب استيثاق!"
+msgstr "ما Ùيش طلب تسجيل دخول مطلوب."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "لا ملاحظه محدده."
+msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ù„ÙØ¬ إلى الموقع"
+msgstr "تاريخ صلاحية الاماره خلص."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
#: actions/outbox.php:61
#, php-format
@@ -2059,7 +2352,7 @@ msgstr "تعذّر Ø­ÙØ¸ كلمه السر الجديده."
msgid "Password saved."
msgstr "Ø­ÙÙØ¸Øª كلمه السر."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "المسارات"
@@ -2067,133 +2360,148 @@ msgstr "المسارات"
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "لا يمكن قراءه دليل السمات: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "لا يمكن الكتابه ÙÙ‰ دليل Ø§Ù„Ø£ÙØªØ§Ø±Ø§Øª: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "لا يمكن الكتابه ÙÙ‰ دليل الخلÙيات: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "لا يمكن قراءه دليل المحليات: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "الموقع"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "خادوم"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "اسم مضي٠خادوم الموقع."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "المسار"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "مسار الموقع"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "مسار المحليات"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "مسار دليل المحليات"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "مسارات ÙØ§Ø®Ø±Ø©"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "أأستخدم مسارات ÙØ§Ø®Ø±Ù‡ (يمكن قراءتها وتذكرها بسهوله أكبر)ØŸ"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "السمة"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "خادوم السمات"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "مسار السمات"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Ø£ÙØªØ§Ø±Ø§Øª"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "خادوم Ø§Ù„Ø£ÙØªØ§Ø±Ø§Øª"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "مسار Ø§Ù„Ø£ÙØªØ§Ø±Ø§Øª"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "دليل Ø§Ù„Ø£ÙØªØ§Ø±."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "خلÙيات"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "خادوم الخلÙيات"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "مسار الخلÙيات"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "دليل الخلÙيات"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "مطلقا"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "أحيانًا"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "دائمًا"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "استخدم SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
-msgstr "خادوم SSL"
+msgstr "SSL server"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Ø§Ø­ÙØ¸ المسارات"
@@ -2251,7 +2559,7 @@ msgid "Full name"
msgstr "الاسم الكامل"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Ø§Ù„ØµÙØ­Ù‡ الرئيسية"
@@ -2274,7 +2582,7 @@ msgstr "السيرة"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "الموقع"
@@ -2298,7 +2606,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "اللغة"
@@ -2324,7 +2632,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "لم ØªÙØ®ØªØ± المنطقه الزمنيه."
@@ -2337,23 +2645,23 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "لم يمكن Ø­ÙØ¸ ØªÙØ¶ÙŠÙ„ات الموقع."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "تعذّر Ø­ÙØ¸ المل٠الشخصى."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "تعذّر Ø­ÙØ¸ الوسوم."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Ø­ÙÙØ¸Øª الإعدادات."
@@ -2375,36 +2683,36 @@ msgstr "المسار الزمنى العام، ØµÙØ­Ù‡ %d"
msgid "Public timeline"
msgstr "المسار الزمنى العام"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr ""
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "كن أول من ÙŠÙØ±Ø³Ù„!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2417,7 +2725,7 @@ msgstr ""
"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
"([اقرأ المزيد](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2452,7 +2760,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "سحابه الوسوم"
@@ -2588,7 +2896,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -2628,7 +2936,7 @@ msgid "Same as password above. Required."
msgstr "Ù†ÙØ³ كلمه السر أعلاه. مطلوب."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "البريد الإلكتروني"
@@ -2712,7 +3020,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "اشترك"
@@ -2738,17 +3046,17 @@ msgstr ""
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
-msgstr "لا ملاحظه محدده."
+msgstr "ما Ùيش ملاحظه متحدده."
#: actions/repeat.php:76
msgid "You can't repeat your own notice."
-msgstr "لا يمكنك تكرار ملاحظتك الشخصيه."
+msgstr "ما ÙŠÙ†ÙØ¹Ø´ تكرر الملاحظه بتاعتك."
#: actions/repeat.php:90
msgid "You already repeated that notice."
-msgstr "أنت كررت هذه الملاحظه Ø¨Ø§Ù„ÙØ¹Ù„."
+msgstr "انت عيدت الملاحظه دى ÙØ¹Ù„ا."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "مكرر"
@@ -2762,6 +3070,11 @@ msgstr "مكرر!"
msgid "Replies to %s"
msgstr "الردود على %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "الردود على %s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2803,6 +3116,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2811,6 +3128,121 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "الجلسات"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "الإعدادات الأساسيه لموقع StatusNet هذا."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "تنقيح الجلسة"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "مكّن تنقيح Ù…ÙØ®Ø±Ø¬Ø§Øª الجلسه."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "اذ٠إعدادت الموقع"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "لازم تكون مسجل دخولك علشان تشو٠اى application."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "الاسم"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "المنظمه"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "الوصÙ"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "اسمح للURL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "أمتأكد من أنك تريد حذ٠هذا الإشعار؟"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "إشعارات %s المÙÙØ¶Ù„Ø©"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2864,17 +3296,22 @@ msgstr "إنها إحدى وسائل مشاركه ما تحب."
msgid "%s group"
msgstr "مجموعه %s"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s أعضاء المجموعة, Ø§Ù„ØµÙØ­Ù‡ %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "مل٠المجموعه الشخصي"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "مسار"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "ملاحظة"
@@ -2920,10 +3357,6 @@ msgstr "(لا شيء)"
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "إحصاءات"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "أنشئ"
@@ -2978,6 +3411,11 @@ msgstr "Ø­ÙØ°Ù الإشعار."
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s والأصدقاء, Ø§Ù„ØµÙØ­Ù‡ %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3003,25 +3441,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3030,7 +3468,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3038,7 +3476,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "تكرارات %s"
@@ -3055,200 +3493,146 @@ msgstr "المستخدم مسكت من قبل."
msgid "Basic settings for this StatusNet site."
msgstr "الإعدادات الأساسيه لموقع StatusNet هذا."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "يجب ألا يكون طول اسم الموقع ØµÙØ±Ù‹Ø§."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
-msgstr "يجب أن تملك عنوان بريد إلكترونى صالح للاتصال"
+msgstr "لازم يكون عندك عنوان ايميل صالح."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "لغه غير معروÙÙ‡ \"%s\""
+msgstr "لغه مش معروÙÙ‡ \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "حد النص الأدنى هو 140 حرÙًا."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "عام"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "اسم الموقع"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "محلي"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "المنطقه الزمنيه المبدئية"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "المنطقه الزمنيه المبدئيه للموقع؛ ت‌ع‌م عاده."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "لغه الموقع المبدئية"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "مسارات"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "خادوم"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "اسم مضي٠خادوم الموقع."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "مسارات ÙØ§Ø®Ø±Ø©"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "أأستخدم مسارات ÙØ§Ø®Ø±Ù‡ (يمكن قراءتها وتذكرها بسهوله أكبر)ØŸ"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Ù†ÙØ§Ø°"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "خاص"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "بالدعوه Ùقط"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Ù…ÙØºÙ„Ù‚"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "عطّل التسجيل الجديد."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "ÙÙ‰ مهمه Ù…ÙØ¬Ø¯ÙˆÙ„Ø©"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "التكرار"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "بلّغ عن المسار"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "الحدود"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "حد النص"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "أقصى عدد للحرو٠ÙÙ‰ الإشعارات."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "اذ٠إعدادت الموقع"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "إعدادات الرسائل القصيرة"
+msgstr "تظبيطات الـSMS"
#: actions/smssettings.php:69
#, php-format
@@ -3276,9 +3660,8 @@ msgid "Enter the code you received on your phone."
msgstr ""
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
-msgstr "لا رقم هاتÙ."
+msgstr "نمرة تليÙون الـSMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3343,15 +3726,25 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "تعذّر Ø­ÙØ¸ الاشتراك."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ليس Ù…ÙØ³ØªØ®Ø¯Ù…ًا محليًا."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "لا مل٠كهذا."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Ù…ÙØ´ØªØ±Ùƒ"
@@ -3361,9 +3754,9 @@ msgid "%s subscribers"
msgstr "مشتركو %s"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "مشتركو %sØŒ Ø§Ù„ØµÙØ­Ù‡ %d"
+msgstr "%1$s مشتركين, ØµÙØ­Ù‡ %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3398,9 +3791,9 @@ msgid "%s subscriptions"
msgstr "اشتراكات %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "اشتراكات %sØŒ Ø§Ù„ØµÙØ­Ù‡ %d"
+msgstr "%1$s اشتراكات, ØµÙØ­Ù‡ %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -3411,7 +3804,7 @@ msgstr "هؤلاء الأشخاص الذى تستمع إليهم."
msgid "These are the people whose notices %s listens to."
msgstr "هؤلاء الأشخاص الذى يستمع %s إليهم."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3421,19 +3814,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "جابر"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "رسائل قصيرة"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "الإشعارات الموسومه ب%s"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3462,13 +3860,14 @@ msgstr ""
msgid "User profile"
msgstr "مل٠المستخدم الشخصي"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "صورة"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr "اوسم المستخدم"
+msgstr "اعمل tag لليوزر"
#: actions/tagother.php:151
msgid ""
@@ -3503,7 +3902,7 @@ msgstr "لم تمنع هذا المستخدم."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
-msgstr "المستخدم ليس ÙÙ‰ صندوق الرمل."
+msgstr "اليوزر مش ÙÙ‰ السبوره."
#: actions/unsilence.php:72
msgid "User is not silenced."
@@ -3517,7 +3916,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr ""
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3532,84 +3931,64 @@ msgstr "المستخدم"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرÙ."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "المل٠الشخصي"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "حد السيرة"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "مستخدمون جدد"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "ترحيب المستخدمين الجدد"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "نص الترحيب بالمستخدمين الجدد (255 حرÙًا كحد أقصى)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "الاشتراك المبدئي"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "الدعوات"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "الدعوات Ù…ÙÙØ¹Ù„Ø©"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "الجلسات"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "تنقيح الجلسة"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "مكّن تنقيح Ù…ÙØ®Ø±Ø¬Ø§Øª الجلسه."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3621,84 +4000,84 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "الرخصة"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "اقبل"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "اشترك بهذا المستخدم"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Ø§Ø±ÙØ¶"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Ø§Ø±ÙØ¶ هذا الاشتراك"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "لا طلب استيثاق!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "رÙÙØ¶ الاشتراك"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr ""
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3717,6 +4096,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "استمتع بالنقانق!"
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s أعضاء المجموعة, Ø§Ù„ØµÙØ­Ù‡ %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3732,9 +4116,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "إحصاءات"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -3743,11 +4127,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Ø­ÙØ°ÙÙØª الحاله."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3779,24 +4158,13 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "الاسم المستعار"
-
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "الجلسات"
+msgstr "النسخه"
#: actions/version.php:197
-#, fuzzy
msgid "Author(s)"
-msgstr "المؤلÙ"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "الوصÙ"
+msgstr "المؤلÙ/ين"
#: classes/File.php:144
#, php-format
@@ -3816,24 +4184,21 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "مل٠المجموعه الشخصي"
+msgstr "دخول الجروپ ÙØ´Ù„."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "تعذر تحديث المجموعه."
+msgstr "مش جزء من الجروپ."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "مل٠المجموعه الشخصي"
+msgstr "الخروج من الجروپ ÙØ´Ù„."
#: classes/Login_token.php:76
#, php-format
msgid "Could not create login token for %s"
-msgstr "لم يمكن إنشاء توكن الولوج ل%s"
+msgstr "ما Ù†ÙØ¹Ø´ يتعمل امارة تسجيل دخول لـ %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -3847,58 +4212,82 @@ msgstr "تعذّر إدراج الرساله."
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "مشكله ÙÙ‰ Ø­ÙØ¸ الإشعار. طويل جدًا."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "مشكله ÙÙ‰ Ø­ÙØ¸ الإشعار. مستخدم غير معروÙ."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "مشكله أثناء Ø­ÙØ¸ الإشعار."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "مشكله أثناء Ø­ÙØ¸ الإشعار."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Ù…ÙØ´ØªØ±Ùƒ أصلا!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "لقد منعك المستخدم."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "غير مشترك!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "ما Ù†ÙØ¹Ø´ يمسح الاشتراك الشخصى."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذ٠الاشتراك."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم ÙÙ‰ %1$s يا @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "تعذّر إنشاء المجموعه."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "تعذّر ضبط عضويه المجموعه."
@@ -3931,136 +4320,132 @@ msgid "Other options"
msgstr "خيارات أخرى"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "ØµÙØ­Ù‡ غير Ù…ÙØ¹Ù†ÙˆÙ†Ø©"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "المل٠الشخصى ومسار الأصدقاء الزمني"
-#: lib/action.php:435
-msgid "Account"
-msgstr "الحساب"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعÙ"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ù„ÙØ¬ إلى الموقع"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "إشعار Ø§Ù„ØµÙØ­Ø©"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "عن"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "الأسئله المكررة"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4069,12 +4454,12 @@ msgstr ""
"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4085,32 +4470,54 @@ msgstr ""
"Ø§Ù„Ù…ØªÙˆÙØ± تحت [رخصه غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "الرخصه."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "بعد"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4118,9 +4525,8 @@ msgid "You cannot make changes to this site."
msgstr ""
#: lib/adminpanelaction.php:107
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "لا ÙŠÙØ³Ù…Ø­ بالتسجيل."
+msgstr "التغييرات مش مسموحه للـ لوحه دى."
#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
@@ -4142,10 +4548,99 @@ msgstr "ضبط الموقع الأساسي"
msgid "Design configuration"
msgstr "ضبط التصميم"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "ضبط المسارات"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "ضبط التصميم"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "ضبط المسارات"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "ضبط التصميم"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr ""
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "اوص٠الapplication بتاعتك"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "Source URL"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "بطّل"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "مرÙقات"
@@ -4166,15 +4661,13 @@ msgstr ""
msgid "Tags for this attachment"
msgstr "وسوم هذا المرÙÙ‚"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
-#, fuzzy
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
-msgstr "تغيير كلمه السر"
+msgstr "تغيير الپاسوورد ÙØ´Ù„"
-#: lib/authenticationplugin.php:197
-#, fuzzy
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
-msgstr "تغيير كلمه السر"
+msgstr "تغيير الپاسوورد مش مسموح"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
@@ -4193,18 +4686,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "تعذّر إيجاد المستخدم الهدÙ."
+msgstr "ما Ù†ÙØ¹Ø´ يلاقى يوزر بإسم %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "أرسل التنبيه"
+msgstr "Nudge اتبعتت لـ %s"
#: lib/command.php:126
#, php-format
@@ -4218,9 +4711,8 @@ msgstr ""
"الإشعارات: %3$s"
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "لا مل٠بهذه الهويه."
+msgstr "الملاحظه بالـID ده مالهاش وجود"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
@@ -4232,14 +4724,13 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "لست عضوا ÙÙ‰ تلك المجموعه."
+msgstr "انت اصلا عضو ÙÙ‰ الجروپ ده"
#: lib/command.php:231
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "ما Ù†ÙØ¹Ø´ يدخل اليوزر %s لجروپ %s"
#: lib/command.php:236
#, php-format
@@ -4247,14 +4738,14 @@ msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعه %s"
#: lib/command.php:275
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "ما Ù†ÙØ¹Ø´ يشيل اليوزر %s لجروپ %s"
#: lib/command.php:280
-#, fuzzy, php-format
+#, php-format
msgid "%s left group %s"
-msgstr "%s انضم إلى مجموعه %s"
+msgstr "%s ساب الجروپ %s"
#: lib/command.php:309
#, php-format
@@ -4282,18 +4773,17 @@ msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:367
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent"
-msgstr "رساله مباشره %s"
+msgstr "رساله مباشره اتبعتت لـ %s"
#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملحوظتك الخاصه."
+msgstr "الملاحظه بتاعتك مش Ù†Ø§ÙØ¹Ù‡ تتكرر"
#: lib/command.php:418
msgid "Already repeated that notice"
@@ -4326,54 +4816,64 @@ msgstr "خطأ أثناء Ø­ÙØ¸ الإشعار."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "لا مستخدم كهذا."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Ù…ÙØ´ØªØ±Ùƒ ب%s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ألغ٠الاشتراك"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "لست Ù…ÙØ´ØªØ±ÙƒÙ‹Ø§ بأى أحد."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4383,11 +4883,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4397,11 +4897,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "لست عضوًا ÙÙ‰ أى مجموعه."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا ÙÙ‰ أى مجموعه."
@@ -4411,7 +4911,7 @@ msgstr[3] "أنت عضو ÙÙ‰ هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4425,6 +4925,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4452,19 +4953,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "اذهب إلى Ø§Ù„Ù…ÙØ«Ø¨Ù‘ت."
@@ -4480,6 +4981,14 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "كونيكشونات (Connections)"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "خطأ قاعده بيانات"
@@ -4662,15 +5171,15 @@ msgstr "ميجابايت"
msgid "kB"
msgstr "كيلوبايت"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "لغه غير معروÙÙ‡ \"%s\""
+msgstr "مصدر الـinbox مش معرو٠%d."
#: lib/joinform.php:114
msgid "Join"
@@ -4730,9 +5239,9 @@ msgid ""
msgstr ""
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr "السيرة: %s\n"
+msgstr "عن Ù†ÙØ³Ùƒ: %s"
#: lib/mail.php:286
#, php-format
@@ -4862,7 +5371,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "من"
@@ -4883,9 +5392,9 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "نسق غير مدعوم."
+msgstr "نوع رساله مش مدعوم: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
@@ -4926,9 +5435,8 @@ msgid "File could not be moved to destination directory."
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "تعذّر Ø­Ø°Ù Ø§Ù„Ù…ÙØ¶Ù„Ù‡."
+msgstr "مش Ù†Ø§ÙØ¹ يتحدد نوع الـMIME بتاع Ø§Ù„ÙØ§ÙŠÙ„."
#: lib/mediafile.php:270
#, php-format
@@ -4970,67 +5478,61 @@ msgid "Attach a file"
msgstr "أرÙÙ‚ ملÙًا"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "لم يمكن Ø­ÙØ¸ ØªÙØ¶ÙŠÙ„ات الموقع."
+msgstr "اعمل مشاركه لمكانى"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "لم يمكن Ø­ÙØ¸ ØªÙØ¶ÙŠÙ„ات الموقع."
+msgstr "ما تعملش مشاركه لمكانى"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Ø´"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ج"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "ر"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "غ"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "ÙÙŠ"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "ÙÙ‰ السياق"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
-msgstr "مكرر بواسطة"
+msgstr "متكرر من"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Ø±ÙØ¯ على هذا الإشعار"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Ø±ÙØ¯"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -5062,11 +5564,7 @@ msgstr "خطأ أثناء إدراج المل٠الشخصى البعيد"
msgid "Duplicate notice"
msgstr "ضاع٠الإشعار"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "تعذّر إدراج اشتراك جديد."
@@ -5082,19 +5580,19 @@ msgstr "الردود"
msgid "Favorites"
msgstr "Ø§Ù„Ù…ÙØ¶Ù„ات"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "صندوق الوارد"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "رسائلك الواردة"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "صندوق الصادر"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "رسائلك Ø§Ù„Ù…ÙØ±Ø³Ù„Ø©"
@@ -5104,9 +5602,8 @@ msgid "Tags in %s's notices"
msgstr ""
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "إجراء غير معروÙ"
+msgstr "مش معروÙ"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -5172,6 +5669,10 @@ msgstr "كرر هذا الإشعار؟"
msgid "Repeat this notice"
msgstr "كرر هذا الإشعار"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5239,34 +5740,6 @@ msgstr "الأشخاص المشتركون ب%s"
msgid "Groups %s is a member of"
msgstr "المجموعات التى %s عضو Ùيها"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Ù…ÙØ´ØªØ±Ùƒ أصلا!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "لقد منعك المستخدم."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "تعذّر الاشتراك."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "غير مشترك!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "لم يمكن حذ٠اشتراك ذاتى."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "تعذّر حذ٠الاشتراك."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5317,67 +5790,67 @@ msgstr "عدّل Ø§Ù„Ø£ÙØªØ§Ø±"
msgid "User actions"
msgstr "ØªØµØ±ÙØ§Øª المستخدم"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "عدّل إعدادات المل٠الشخصي"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "عدّل"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "أرسل رساله مباشره إلى هذا المستخدم"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "رسالة"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
@@ -5391,7 +5864,7 @@ msgstr "%s ليس لونًا صحيحًا!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 7fe8ac423..3cb121628 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,17 +9,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:47+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:11+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "ДоÑтъп"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "ÐаÑтройки за доÑтъп до Ñайта"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "РегиÑтриране"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "ЧаÑтен"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Само Ñ Ð¿Ð¾ÐºÐ°Ð½Ð¸"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Ðовите региÑтрации да Ñа Ñамо Ñ Ð¿Ð¾ÐºÐ°Ð½Ð¸."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Затворен"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Изключване на новите региÑтрации."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Запазване"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Запазване наÑтройките за доÑтъп"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +86,29 @@ msgstr "ÐÑма такака Ñтраница."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "ÐÑма такъв потребител"
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s и приÑтели, Ñтраница %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -93,7 +149,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +160,8 @@ msgstr ""
msgid "You and friends"
msgstr "Вие и приÑтелите"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Бележки от %1$s и приÑтели в %2$s."
@@ -115,23 +171,23 @@ msgstr "Бележки от %1$s и приÑтели в %2$s."
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Ðе е открит методът в API."
@@ -145,7 +201,7 @@ msgstr "Ðе е открит методът в API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Този метод изиÑква заÑвка POST."
@@ -174,8 +230,9 @@ msgstr "Грешка при запазване на профила."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -296,12 +353,12 @@ msgstr "Ðе можете да Ñпрете да Ñледите Ñебе Ñи!"
msgid "Two user ids or screen_names must be supplied."
msgstr "ТрÑбва да Ñе дадат два идентификатора или имена на потребители."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Грешка при изтеглÑне на Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾Ðº"
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "ЦелевиÑÑ‚ потребител не беше открит."
@@ -325,7 +382,8 @@ msgstr "Опитайте друг пÑевдоним, този вече е заÐ
msgid "Not a valid nickname."
msgstr "Ðеправилен пÑевдоним."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -337,7 +395,8 @@ msgstr "ÐдреÑÑŠÑ‚ на личната Ñтраница не е правил
msgid "Full name is too long (max 255 chars)."
msgstr "Пълното име е твърде дълго (макÑ. 255 знака)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ОпиÑанието е твърде дълго (до %d Ñимвола)."
@@ -362,9 +421,9 @@ msgstr "Ðеправилен пÑевдоним: \"%s\""
#: actions/apigroupcreate.php:273 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:286 actions/editgroup.php:234
#: actions/newgroup.php:178
@@ -373,7 +432,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Групата не е открита."
@@ -414,6 +473,115 @@ msgstr "Групи на %s"
msgid "groups on %s"
msgstr "групи в %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Ðеправилен размер."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!"
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Ðеправилно име или парола."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Грешка в наÑтройките на потребителÑ."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Ðеочаквано изпращане на форма."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Сметка"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "ПÑевдоним"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Парола"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Ð’Ñички"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Този метод изиÑква заÑвка POST или DELETE."
@@ -443,17 +611,17 @@ msgstr "Бележката е изтрита."
msgid "No status with that ID found."
msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Ðе е открито."
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -467,7 +635,7 @@ msgstr "Ðеподдържан формат."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / ОтбелÑзани като любими от %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s бележки отбелÑзани като любими от %s / %s."
@@ -478,7 +646,7 @@ msgstr "%s бележки отбелÑзани като любими от %s / %
msgid "%s timeline"
msgstr "Поток на %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -494,27 +662,22 @@ msgstr "%1$s / Реплики на %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s реплики на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Общ поток на %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Повторено от %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Повторено за %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð½Ð° %s"
@@ -524,7 +687,7 @@ msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð½Ð° %s"
msgid "Notices tagged with %s"
msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
@@ -586,8 +749,8 @@ msgstr "Оригинал"
msgid "Preview"
msgstr "Преглед"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Изтриване"
@@ -599,29 +762,6 @@ msgstr "Качване"
msgid "Crop"
msgstr "ИзрÑзване"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!"
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Ðеочаквано изпращане на форма."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Изберете квадратна облаÑÑ‚ от изображението за аватар"
@@ -657,8 +797,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Ðе"
@@ -666,13 +807,13 @@ msgstr "Ðе"
msgid "Do not block this user"
msgstr "Да не Ñе блокира този потребител"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокиране на потребителÑ"
@@ -757,8 +898,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Грешка при изтриване потвърждението по е-поща."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Потвърждаване на адреÑа"
+msgid "Confirm address"
+msgstr "Потвърждаване на адреÑ"
#: actions/confirmaddress.php:159
#, php-format
@@ -774,10 +915,54 @@ msgstr "Разговор"
msgid "Notices"
msgstr "Бележки"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "За да редактирате група, трÑбва да Ñте влезли."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Бележката нÑма профил"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Ðе членувате в тази група."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "ÐÑма такава бележка."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Да не Ñе изтрива бележката"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Изтриване на бележката"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -806,7 +991,7 @@ msgstr "ÐаиÑтина ли иÑкате да изтриете тази бел
msgid "Do not delete this notice"
msgstr "Да не Ñе изтрива бележката"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Изтриване на бележката"
@@ -939,16 +1124,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Запазване"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -961,10 +1136,87 @@ msgstr "Тази бележка не е отбелÑзана като любим
msgid "Add to favorites"
msgstr "ДобавÑне към любимите"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "ÐÑма такъв документ."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Други наÑтройки"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "За да редактирате група, трÑбва да Ñте влезли."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "ÐÑма такава бележка."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Използвайте тази бланка за Ñъздаване на нова група."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Същото като паролата по-горе. Задължително поле."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Пълното име е твърде дълго (макÑ. 255 знака)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Опитайте друг пÑевдоним, този вече е зает."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "ОпиÑание"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "ÐдреÑÑŠÑ‚ на личната Ñтраница не е правилен URL."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Името на меÑтоположението е твърде дълго (макÑ. 255 знака)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Грешка при обновÑване на групата."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -993,7 +1245,7 @@ msgstr "ОпиÑанието е твърде дълго (до %d Ñимвола)
msgid "Could not update group."
msgstr "Грешка при обновÑване на групата."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Грешка при отбелÑзване като любима."
@@ -1003,7 +1255,6 @@ msgid "Options saved."
msgstr "ÐаÑтройките Ñа запазени."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "ÐаÑтройки на е-поща"
@@ -1036,14 +1287,14 @@ msgstr ""
"Ñпам) за Ñъобщение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Отказ"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "ÐдреÑи на е-поща"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1118,7 +1369,7 @@ msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреÑа на е-пощата"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ðеправилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща."
@@ -1130,7 +1381,7 @@ msgstr "Това и Ñега е адреÑÑŠÑ‚ на е-пощата ви."
msgid "That email address already belongs to another user."
msgstr "Тази е-поща вече Ñе използва от друг потребител."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Ðе може да Ñе вмъкне код за потвърждение."
@@ -1193,7 +1444,7 @@ msgstr "Тази бележка вече е отбелÑзана като люб
msgid "Disfavor favorite"
msgstr "Ðелюбимо"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "ПопулÑрни бележки"
@@ -1340,7 +1591,7 @@ msgstr "ПотребителÑÑ‚ вече е блокиран за групатÐ
msgid "User is not a member of group."
msgstr "ПотребителÑÑ‚ не членува в групата."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Блокиране на потребителÑ"
@@ -1439,24 +1690,24 @@ msgstr "Членове на групата %s, Ñтраница %d"
msgid "A list of the users in this group."
msgstr "СпиÑък Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ в тази група."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "ÐаÑтройки"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Блокиране"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
#, fuzzy
msgid "Make user an admin of the group"
msgstr "За да редактирате групата, трÑбва да Ñте й админиÑтратор."
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1630,6 +1881,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Това не е вашиÑÑ‚ Jabber ID."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "ВходÑща ÐºÑƒÑ‚Ð¸Ñ Ð·Ð° %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1710,7 +1966,7 @@ msgstr "Лично Ñъобщение"
msgid "Optionally add a personal message to the invitation."
msgstr "Може да добавите и лично Ñъобщение към поканата."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Прати"
@@ -1794,9 +2050,9 @@ msgid "You are not a member of that group."
msgstr "Ðе членувате в тази група."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s напуÑна групата %s"
+msgstr "%1$s напуÑна групата %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1811,25 +2067,14 @@ msgstr "Грешно име или парола."
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
#: actions/login.php:227
msgid "Login to site"
-msgstr ""
-
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "ПÑевдоним"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Парола"
+msgstr "Вход в Ñайта"
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
@@ -1860,21 +2105,21 @@ msgstr ""
"Влезте Ñ Ð¸Ð¼Ðµ и парола. ÐÑмате такива? [РегиÑтрирайте](%%action.register%%) "
"нова Ñметка или опитайте Ñ [OpenID](%%action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "ПотребителÑÑ‚ вече е блокиран за групата."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "За да редактирате групата, трÑбва да Ñте й админиÑтратор."
@@ -1883,6 +2128,30 @@ msgstr "За да редактирате групата, трÑбва да ÑÑ‚Ð
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "ÐÑма такава бележка."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "За да Ñъздавате група, трÑбва да Ñте влезли."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Използвайте тази бланка за Ñъздаване на нова група."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Грешка при отбелÑзване като любима."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ðова група"
@@ -1991,6 +2260,51 @@ msgstr "Побутването е изпратено"
msgid "Nudge sent!"
msgstr "Побутването е изпратено!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "За да редактирате група, трÑбва да Ñте влезли."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Други наÑтройки"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Ðе членувате в тази група."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Бележката нÑма профил"
@@ -2008,8 +2322,8 @@ msgstr "вид Ñъдържание "
msgid "Only "
msgstr "Само "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ðеподдържан формат на данните"
@@ -2022,7 +2336,7 @@ msgid "Notice Search"
msgstr "ТърÑене на бележки"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Други наÑтройки"
#: actions/othersettings.php:71
@@ -2079,6 +2393,11 @@ msgstr "Ðевалидно Ñъдържание на бележка"
msgid "Login token expired."
msgstr "Влизане в Ñайта"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "ИзходÑща ÐºÑƒÑ‚Ð¸Ñ Ð·Ð° %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2150,7 +2469,7 @@ msgstr "Грешка при запазване на новата парола."
msgid "Password saved."
msgstr "Паролата е запиÑана."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Пътища"
@@ -2158,133 +2477,148 @@ msgstr "Пътища"
msgid "Path and server settings for this StatusNet site."
msgstr "Пътища и Ñървърни наÑтройки за тази инÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ Ð½Ð° StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Страницата не е доÑтъпна във вида медиÑ, който приемате"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Сайт"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Сървър"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Път"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Път до Ñайта"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Кратки URL-адреÑи"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Ðватари"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Сървър на аватара"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Път до аватара"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° аватара"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Фонове"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Сървър на фона"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Път до фона"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° фона"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Ðикога"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "ПонÑкога"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Винаги"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Използване на SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Кога да Ñе използва SSL"
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-Ñървър"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Запазване на пътищата"
@@ -2344,7 +2678,7 @@ msgid "Full name"
msgstr "Пълно име"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Лична Ñтраница"
@@ -2367,7 +2701,7 @@ msgstr "За мен"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "МеÑтоположение"
@@ -2391,7 +2725,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Език"
@@ -2419,7 +2753,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "БиографиÑта е твърде дълга (до %d Ñимвола)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Ðе е избран чаÑови поÑÑ"
@@ -2432,24 +2766,24 @@ msgstr "Името на езика е твърде дълго (може да е
msgid "Invalid tag: \"%s\""
msgstr "Ðеправилен етикет: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Грешка при запазване етикетите."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Грешка при запазване на профила."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Грешка при запазване етикетите."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "ÐаÑтройките Ñа запазени."
@@ -2471,36 +2805,36 @@ msgstr "Общ поток, Ñтраница %d"
msgid "Public timeline"
msgstr "Общ поток"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "ЕмиÑÐ¸Ñ Ð½Ð° Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾Ðº (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "ЕмиÑÐ¸Ñ Ð½Ð° Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾Ðº (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "ЕмиÑÐ¸Ñ Ð½Ð° Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾Ðº (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2509,7 +2843,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2543,7 +2877,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2682,7 +3016,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "ЗапиÑването е уÑпешно."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑтриране"
@@ -2724,7 +3058,7 @@ msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-поща"
@@ -2752,7 +3086,7 @@ msgid ""
msgstr " оÑвен тези лични данни: парола, е-поща, меÑинджър, телефон."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2769,9 +3103,9 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"ПоздравлениÑ, %s! И добре дошли в %%%%site.name%%%%! от тук можете да...\n"
+"ПоздравлениÑ, %1$s! И добре дошли в %%%%site.name%%%%! от тук можете да...\n"
"\n"
-"* Отидете в [профила Ñи](%s) и да публикувате първата Ñи бележка.\n"
+"* Отидете в [профила Ñи](%2$s) и да публикувате първата Ñи бележка.\n"
"* Добавите [Ð°Ð´Ñ€ÐµÑ Ð² Jabber/GTalk](%%%%action.imsettings%%%%), за да "
"изпращате бележки от програмата Ñи за моментни ÑъобщениÑ.\n"
"* [ТърÑите хора](%%%%action.peoplesearch%%%%), които познавате или Ñ ÐºÐ¾Ð¸Ñ‚Ð¾ "
@@ -2829,7 +3163,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° профила ви в друга, ÑъвмеÑтима уÑлуга за микроблогване"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Ðбониране"
@@ -2867,7 +3201,7 @@ msgstr "Ðе можете да повтарÑте ÑобÑтвена бележÐ
msgid "You already repeated that notice."
msgstr "Вече Ñте повторили тази бележка."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Повторено"
@@ -2881,6 +3215,11 @@ msgstr "Повторено!"
msgid "Replies to %s"
msgstr "Отговори на %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Отговори до %1$s в %2$s!"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2922,6 +3261,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Отговори до %1$s в %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2932,6 +3275,124 @@ msgstr "Ðе може да изпращате ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ този Ð
msgid "User is already sandboxed."
msgstr "ПотребителÑÑ‚ ви е блокирал."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "СеÑии"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "ОÑновни наÑтройки на тази инÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ Ð½Ð° StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Управление на ÑеÑии"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Запазване наÑтройките на Ñайта"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "За напуÑнете група, трÑбва да Ñте влезли."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Бележката нÑма профил"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Икона"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Име"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "ОрганизациÑ"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "ОпиÑание"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "СтатиÑтики"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Ðвтор"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "ÐаиÑтина ли иÑкате да изтриете тази бележка?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Любими бележки на %1$s, Ñтраница %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Грешка при изтеглÑне на любимите бележки"
@@ -2981,23 +3442,28 @@ msgstr "Така можете да Ñподелите какво хареÑваÑ
msgid "%s group"
msgstr "Група %s"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Членове на групата %s, Ñтраница %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Профил на групата"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
-msgstr ""
+msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Бележка"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "ПÑевдоними"
#: actions/showgroup.php:293
msgid "Group actions"
@@ -3037,10 +3503,6 @@ msgstr ""
msgid "All members"
msgstr "Ð’Ñички членове"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "СтатиÑтики"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Създадена на"
@@ -3095,6 +3557,11 @@ msgstr "Бележката е изтрита."
msgid " tagged %s"
msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, Ñтраница %2$d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3120,25 +3587,25 @@ msgstr "ЕмиÑÐ¸Ñ Ñ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ на %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF за %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3147,7 +3614,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3155,7 +3622,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Отговори на %s"
@@ -3172,199 +3639,146 @@ msgstr "ПотребителÑÑ‚ вече е заглушен."
msgid "Basic settings for this StatusNet site."
msgstr "ОÑновни наÑтройки на тази инÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ Ð½Ð° StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Името на Ñайта е задължително."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "ÐдреÑÑŠÑ‚ на е-поща за контакт е задължителен"
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Ðепознат език \"%s\""
+msgstr "Ðепознат език \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Минималното ограничение на текÑта е 140 знака."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Общи"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Име на Ñайта"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща за контакт ÑÑŠÑ Ñайта"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "МеÑтоположение"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "ЧаÑови поÑÑ Ð¿Ð¾ подразбиране"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "ЧаÑови поÑÑ Ð¿Ð¾ подразбиране за Ñайта (обикновено UTC)."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Език по подразбиране за Ñайта"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Сървър"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Кратки URL-адреÑи"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "ДоÑтъп"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "ЧаÑтен"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Само Ñ Ð¿Ð¾ÐºÐ°Ð½Ð¸"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Ðовите региÑтрации да Ñа Ñамо Ñ Ð¿Ð¾ÐºÐ°Ð½Ð¸."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Затворен"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Изключване на новите региÑтрации."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "ЧеÑтота"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "ОграничениÑ"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Запазване наÑтройките на Ñайта"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "ÐаÑтройки за SMS"
@@ -3395,7 +3809,6 @@ msgid "Enter the code you received on your phone."
msgstr "Въведете кода, който получихте по телефона."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Телефонен номер за SMS"
@@ -3470,16 +3883,27 @@ msgstr "Ðе е въведен код."
msgid "You are not subscribed to that profile."
msgstr "Ðе Ñте абонирани за този профил"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Грешка при Ñъздаване на нов абонамент."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ðе е локален потребител."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "ÐÑма такъв файл."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Ðе Ñте абонирани за този профил"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Ðбониране"
@@ -3540,7 +3964,7 @@ msgstr "ÐÑма хора, чийто бележки четете."
msgid "These are the people whose notices %s listens to."
msgstr "Хора, чийто бележки %s чете."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3550,19 +3974,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не получава ничии бележки."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s, Ñтраница %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3592,7 +4021,8 @@ msgstr "Етикети"
msgid "User profile"
msgstr "ПотребителÑки профил"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Снимка"
@@ -3651,7 +4081,7 @@ msgstr "Сървърът не е върнал Ð°Ð´Ñ€ÐµÑ Ð½Ð° профила."
msgid "Unsubscribed"
msgstr "ОтпиÑване"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3666,88 +4096,68 @@ msgstr "Потребител"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профил"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Ðови потребители"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Ð’Ñички абонаменти"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Ðвтоматично абониране за вÑеки, който Ñе абонира за мен (подходÑщо за "
"ботове)."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Покани"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Поканите Ñа включени"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "СеÑии"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Управление на ÑеÑии"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "ОдобрÑване на абонамента"
@@ -3762,37 +4172,37 @@ msgstr ""
"Проверете тези детайли и Ñе уверете, че иÑкате да Ñе абонирате за бележките "
"на този потребител. Ðко не иÑкате абонамента, натиÑнете \"Cancel\" (Отказ)."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Лиценз"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Приемане"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Ðбониране за този потребител"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "ОхвърлÑне"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Ðбонаменти на %s"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "ÐÑма заÑвка за одобрение."
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Ðбонаментът е одобрен"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3802,11 +4212,11 @@ msgstr ""
"Ðбонаментът е одобрен, но не е зададен callback URL. За да завършите "
"одобрÑването, проверете инÑтрукциите на Ñайта. ВашиÑÑ‚ token за абонамент е:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Ðбонаментът е отказан"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3816,37 +4226,37 @@ msgstr ""
"Ðбонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
"абонамента, проверете инÑтрукциите на Ñайта."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Грешка при четене адреÑа на аватара '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Грешен вид изображение за '%s'"
@@ -3866,10 +4276,14 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Членове на групата %s, Ñтраница %d"
+
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "ТърÑене за хора или бележки"
+msgstr "ТърÑене на още групи"
#: actions/usergroups.php:153
#, php-format
@@ -3882,9 +4296,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "СтатиÑтики"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -3893,11 +4307,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Бележката е изтрита."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3927,26 +4336,15 @@ msgstr ""
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
+msgstr "ПриÑтавки"
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "ПÑевдоним"
-
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "СеÑии"
+msgstr "ВерÑиÑ"
#: actions/version.php:197
-#, fuzzy
msgid "Author(s)"
-msgstr "Ðвтор"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑание"
+msgstr "Ðвтор(и)"
#: classes/File.php:144
#, php-format
@@ -3998,28 +4396,28 @@ msgstr "Грешка при вмъкване на Ñъобщението."
msgid "Could not update message with new URI."
msgstr "Грешка при обновÑване на бележката Ñ Ð½Ð¾Ð² URL-адреÑ."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Проблем при запиÑване на бележката."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Грешка при запиÑване на бележката. Ðепознат потребител."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново Ñлед нÑколко минути."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4028,34 +4426,61 @@ msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново Ñлед нÑколко минути."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този Ñайт."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблем при запиÑване на бележката."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Проблем при запиÑване на бележката."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "ПотребителÑÑ‚ е забранил да Ñе абонирате за него."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "ПотребителÑÑ‚ ви е блокирал."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ðе Ñте абонирани!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Грешка при изтриване на абонамента."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Грешка при изтриване на абонамента."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добре дошли в %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Грешка при Ñъздаване на групата."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Грешка при Ñъздаване на нов абонамент."
@@ -4090,140 +4515,136 @@ msgid "Other options"
msgstr "Други наÑтройки"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Ðеозаглавена Ñтраница"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Ðачало"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-msgid "Account"
-msgstr "Сметка"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "ПромÑна на поща, аватар, парола, профил"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Свързване"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Свързване към уÑлуги"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "ПромÑна наÑтройките на Ñайта"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приÑтели и колеги да Ñе приÑъединÑÑ‚ към Ð²Ð°Ñ Ð² %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Изход"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Излизане от Ñайта"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Създаване на нова Ñметка"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Влизане в Ñайта"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Помощ"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "ТърÑене"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "ТърÑене за хора или бележки"
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Ðова бележка"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Ðова бележка"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Ðбонаменти"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "ОтноÑно"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "ВъпроÑи"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "УÑловиÑ"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "ПоверителноÑÑ‚"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Изходен код"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Табелка"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4232,12 +4653,12 @@ msgstr ""
"**%%site.name%%** е уÑлуга за микроблогване, предоÑтавена ви от [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е уÑлуга за микроблогване. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4248,33 +4669,55 @@ msgstr ""
"доÑтъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Лиценз на Ñъдържанието"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "Ð’Ñички "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "След"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Преди"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4308,10 +4751,104 @@ msgstr "ОÑновна наÑтройка на Ñайта"
msgid "Design configuration"
msgstr "ÐаÑтройка на оформлението"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "ÐаÑтройка на пътищата"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "ÐаÑтройка на оформлението"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "ÐаÑтройка на пътищата"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "ÐаÑтройка на оформлението"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Опишете групата или темата в до %d букви"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Опишете групата или темата"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Изходен код"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ñтраница, блог или профил в друг Ñайт на групата"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ñтраница, блог или профил в друг Ñайт на групата"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Премахване"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4332,12 +4869,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Паролата е запиÑана."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Паролата е запиÑана."
@@ -4492,80 +5029,89 @@ msgstr "Грешка при запиÑване на бележката."
msgid "Specify the name of the user to subscribe to"
msgstr "Уточнете името на потребителÑ, за когото Ñе абонирате."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "ÐÑма такъв потребител"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Ðбонирани Ñте за %s."
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Уточнете името на потребителÑ, от когото Ñе отпиÑвате."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "ОтпиÑани Ñте от %s."
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Командата вÑе още не Ñе поддържа."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Уведомлението е изключено."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Грешка при изключване на уведомлението."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Уведомлението е включено."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Грешка при включване на уведомлението."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ОтпиÑани Ñте от %s."
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Ðе Ñте абонирани за никого."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вече Ñте абонирани за Ñледните потребители:"
msgstr[1] "Вече Ñте абонирани за Ñледните потребители:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Ðикой не е абониран за ваÑ."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за ваÑ."
msgstr[1] "Грешка при абониране на друг потребител за ваÑ."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Ðе членувате в нито една група."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ðе членувате в тази група."
msgstr[1] "Ðе членувате в тази група."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4579,6 +5125,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4606,19 +5153,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ðе е открит файл Ñ Ð½Ð°Ñтройки. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в Ñайта"
@@ -4635,6 +5182,15 @@ msgstr "Бележки през меÑинджър (IM)"
msgid "Updates by SMS"
msgstr "Бележки през SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Свързване"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Грешка в базата от данни"
@@ -4822,12 +5378,12 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Ðепознат език \"%s\""
@@ -4900,11 +5456,9 @@ msgstr ""
"Може да Ñмените адреÑа и наÑтройките за уведомÑване по е-поща на %8$s\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"БиографиÑ: %s\n"
-"\n"
+msgstr "БиографиÑ: %s"
#: lib/mail.php:286
#, php-format
@@ -5034,7 +5588,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "от"
@@ -5152,57 +5706,53 @@ msgid "Do not share my location"
msgstr "Грешка при запазване етикетите."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "С"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Ю"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "И"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "З"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "в контекÑÑ‚"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Повторено от"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "ОтговарÑне на тази бележка"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Отговор"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Бележката е повторена."
@@ -5235,12 +5785,7 @@ msgstr "Грешка при вмъкване на отдалечен профиÐ
msgid "Duplicate notice"
msgstr "Изтриване на бележката"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "ПотребителÑÑ‚ е забранил да Ñе абонирате за него."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Грешка при добавÑне на нов абонамент."
@@ -5256,19 +5801,19 @@ msgstr "Отговори"
msgid "Favorites"
msgstr "Любими"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "ВходÑщи"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Получените от Ð²Ð°Ñ ÑъобщениÑ"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "ИзходÑщи"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Изпратените от Ð²Ð°Ñ ÑъобщениÑ"
@@ -5348,6 +5893,10 @@ msgstr "ПовтарÑне на тази бележка"
msgid "Repeat this notice"
msgstr "ПовтарÑне на тази бележка"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5419,36 +5968,6 @@ msgstr "Ðбонирани за %s"
msgid "Groups %s is a member of"
msgstr "Групи, в които учаÑтва %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "ПотребителÑÑ‚ ви е блокирал."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Грешка при абониране."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Грешка при абониране на друг потребител за ваÑ."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ðе Ñте абонирани!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Грешка при изтриване на абонамента."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Грешка при изтриване на абонамента."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5501,67 +6020,67 @@ msgstr "Редактиране на аватара"
msgid "User actions"
msgstr "ПотребителÑки дейÑтвиÑ"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Редактиране на профила"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Редактиране"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Изпращате на прÑко Ñъобщение до този потребител."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Съобщение"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "преди нÑколко Ñекунди"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "преди около чаÑ"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d чаÑа"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "преди около меÑец"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "преди около %d меÑеца"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "преди около година"
@@ -5575,7 +6094,7 @@ msgstr "%s не е допуÑтим цвÑÑ‚!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s не е допуÑтим цвÑÑ‚! Използвайте 3 или 6 шеÑтнадеÑетични знака."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 8ad8d18ec..d94ad8431 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Catalan
#
+# Author@translatewiki.net: Aleator
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Toniher
# --
@@ -9,17 +10,74 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:50+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:15+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Accés"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Desa els paràmetres del lloc"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Registre"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privat"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) "
+"visualitzar el lloc?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Només invitació"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Fes que el registre sigui només amb invitacions."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Tancat"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Inhabilita els nous registres."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Guardar"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Desa els paràmetres del lloc"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +92,29 @@ msgstr "No existeix la pàgina."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "No existeix aquest usuari."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s perfils blocats, pàgina %d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -95,7 +157,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -106,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "Un mateix i amics"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualitzacions de %1$s i amics a %2$s!"
@@ -117,23 +179,23 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "No s'ha trobat el mètode API!"
@@ -148,7 +210,7 @@ msgstr "No s'ha trobat el mètode API!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Aquest mètode requereix POST."
@@ -179,8 +241,9 @@ msgstr "No s'ha pogut guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -304,11 +367,11 @@ msgstr "No podeu suprimir els usuaris."
msgid "Two user ids or screen_names must be supplied."
msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "No s'ha pogut determinar l'usuari d'origen."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "No es pot trobar cap estatus."
@@ -333,7 +396,8 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
msgid "Not a valid nickname."
msgstr "Sobrenom no vàlid."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -345,7 +409,8 @@ msgstr "La pàgina personal no és un URL vàlid."
msgid "Full name is too long (max 255 chars)."
msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descripció és massa llarga (màx. %d caràcters)."
@@ -381,7 +446,7 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "No s'ha trobat el grup!"
@@ -422,6 +487,118 @@ msgstr "%s grups"
msgid "groups on %s"
msgstr "grups sobre %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Mida invàlida."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
+"us plau."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Nom d'usuari o contrasenya invàlids."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Error en configurar l'usuari."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Hashtag de l'error de la base de dades:%s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Enviament de formulari inesperat."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Compte"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Sobrenom"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contrasenya"
+
+#: actions/apioauthauthorize.php:328
+#, fuzzy
+msgid "Deny"
+msgstr "Disseny"
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Tot"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Aquest mètode requereix POST o DELETE."
@@ -453,17 +630,17 @@ msgstr "S'ha suprimit l'estat."
msgid "No status with that ID found."
msgstr "No s'ha trobat cap estatus amb la ID trobada."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Massa llarg. La longitud màxima és de %d caràcters."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "No s'ha trobat"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -477,7 +654,7 @@ msgstr "El format no està implementat."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Preferits de %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s actualitzacions favorites per %s / %s."
@@ -488,7 +665,7 @@ msgstr "%s actualitzacions favorites per %s / %s."
msgid "%s timeline"
msgstr "%s línia temporal"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -504,27 +681,22 @@ msgstr "%1$s / Notificacions contestant a %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s línia temporal pública"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s notificacions de tots!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Repetit per %s"
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Respostes a %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repeticions de %s"
@@ -534,7 +706,7 @@ msgstr "Repeticions de %s"
msgid "Notices tagged with %s"
msgstr "Aviso etiquetats amb %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
@@ -595,8 +767,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Vista prèvia"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Suprimeix"
@@ -608,31 +780,6 @@ msgstr "Puja"
msgid "Crop"
msgstr "Retalla"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
-"us plau."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Enviament de formulari inesperat."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -670,8 +817,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
@@ -679,13 +827,13 @@ msgstr "No"
msgid "Do not block this user"
msgstr "No bloquis l'usuari"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquejar aquest usuari"
@@ -769,7 +917,8 @@ msgid "Couldn't delete email confirmation."
msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Confirmar adreça"
#: actions/confirmaddress.php:159
@@ -786,10 +935,54 @@ msgstr "Conversa"
msgid "Notices"
msgstr "Avisos"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Heu d'iniciar una sessió per editar un grup."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Avís sense perfil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "No sou un membre del grup."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Ha ocorregut algun problema amb la teva sessió."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "No existeix aquest avís."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "No es pot esborrar la notificació."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Eliminar aquesta nota"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -822,7 +1015,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?"
msgid "Do not delete this notice"
msgstr "No es pot esborrar la notificació."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Eliminar aquesta nota"
@@ -951,16 +1144,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Guardar"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Desa el disseny"
@@ -973,10 +1156,87 @@ msgstr "Aquesta notificació no és un favorit!"
msgid "Add to favorites"
msgstr "Afegeix als preferits"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "No existeix aquest document."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Altres opcions"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Heu d'iniciar una sessió per editar un grup."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "No existeix aquest avís."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Utilitza aquest formulari per editar el grup."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Igual a la contrasenya de dalt. Requerit."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Aquest sobrenom ja existeix. Prova un altre. "
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Descripció"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "La pàgina personal no és un URL vàlid."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "No s'ha pogut actualitzar el grup."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1005,7 +1265,7 @@ msgstr "la descripció és massa llarga (màx. %d caràcters)."
msgid "Could not update group."
msgstr "No s'ha pogut actualitzar el grup."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "No s'han pogut crear els àlies."
@@ -1047,7 +1307,8 @@ msgstr ""
"carpeta de spam!) per al missatge amb les instruccions."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancel·la"
@@ -1133,7 +1394,7 @@ msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar l'adreça electrònica."
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
@@ -1145,7 +1406,7 @@ msgstr "Ja és la vostra adreça electrònica."
msgid "That email address already belongs to another user."
msgstr "L'adreça electrònica ja pertany a un altre usuari."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "No s'ha pogut inserir el codi de confirmació."
@@ -1207,7 +1468,7 @@ msgstr "Aquesta nota ja és favorita."
msgid "Disfavor favorite"
msgstr "Desfavoritar favorit"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Notificacions populars"
@@ -1352,7 +1613,7 @@ msgstr "Un usuari t'ha bloquejat."
msgid "User is not a member of group."
msgstr "L'usuari no és membre del grup."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Bloca l'usuari del grup"
@@ -1449,23 +1710,23 @@ 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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Bloca"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Fes l'usuari un administrador del grup"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Fes-lo administrador"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Fes l'usuari administrador"
@@ -1638,6 +1899,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Aquest no és el teu Jabber ID."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Safata d'entrada per %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1723,7 +1989,7 @@ msgstr "Missatge personal"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcionalment pots afegir un missatge a la invitació."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Envia"
@@ -1824,7 +2090,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes."
msgid "Error setting user. You are probably not authorized."
msgstr "No autoritzat."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
@@ -1833,17 +2099,6 @@ msgstr "Inici de sessió"
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Sobrenom"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contrasenya"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Recorda'm"
@@ -1876,21 +2131,21 @@ msgstr ""
"tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
"[OpenID] (%%action.openidlogin%%)."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Només un administrador poc fer a un altre usuari administrador."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%s ja és un administrador del grup «%s»."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "No es pot fer %s un administrador del grup %s"
@@ -1899,6 +2154,30 @@ msgstr "No es pot fer %s un administrador del grup %s"
msgid "No current status"
msgstr "No té cap estatus ara mateix"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "No existeix aquest avís."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Has d'haver entrat per crear un grup."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Utilitza aquest formulari per crear un nou grup."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "No s'han pogut crear els àlies."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nou grup"
@@ -2008,6 +2287,51 @@ msgstr "Reclamació enviada"
msgid "Nudge sent!"
msgstr "Reclamació enviada!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Heu d'iniciar una sessió per editar un grup."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Altres opcions"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "No ets membre d'aquest grup."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Avís sense perfil"
@@ -2025,8 +2349,8 @@ msgstr "tipus de contingut "
msgid "Only "
msgstr "Només "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2039,7 +2363,8 @@ msgid "Notice Search"
msgstr "Cerca de notificacions"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Altres configuracions"
#: actions/othersettings.php:71
@@ -2096,6 +2421,11 @@ msgstr "El contingut de l'avís és invàlid"
msgid "Login token expired."
msgstr "Accedir al lloc"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Safata de sortida per %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2168,7 +2498,7 @@ msgstr "No es pot guardar la nova contrasenya."
msgid "Password saved."
msgstr "Contrasenya guardada."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Camins"
@@ -2176,133 +2506,149 @@ msgstr "Camins"
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Aquesta pàgina no està disponible en "
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "No es pot escriure al directori de fons: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Lloc"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Servidor"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Servidor central del lloc."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Camí"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Camí del lloc"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Servidor dels temes"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Camí dels temes"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Directori de temes"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Servidor d'avatars"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Camí de l'avatar"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Directori d'avatars"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Fons"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Servidor de fons"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Camí dels fons"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Directori de fons"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Mai"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "A vegades"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Utilitza l'SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Servidor SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Avís del lloc"
@@ -2366,7 +2712,7 @@ msgid "Full name"
msgstr "Nom complet"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pàgina personal"
@@ -2390,7 +2736,7 @@ msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Ubicació"
@@ -2416,7 +2762,7 @@ msgstr ""
"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
"por espais"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Idioma"
@@ -2444,7 +2790,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografia és massa llarga (màx. %d caràcters)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Franja horària no seleccionada."
@@ -2457,23 +2803,23 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)."
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta no vàlida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "No es pot actualitzar l'usuari per autosubscriure."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "No s'han pogut desar les preferències d'ubicació."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "No s'ha pogut guardar el perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "No s'han pogut guardar les etiquetes."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Configuració guardada."
@@ -2495,19 +2841,19 @@ msgstr "Línia temporal pública, pàgina %d"
msgid "Public timeline"
msgstr "Línia temporal pública"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Flux de canal públic (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Flux de canal públic (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Flux de canal públic (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2516,11 +2862,11 @@ msgstr ""
"Aquesta és la línia temporal pública de %%site.name%%, però ningú no hi ha "
"enviat res encara."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Sigueu el primer en escriure-hi!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2528,7 +2874,7 @@ msgstr ""
"Per què no [registreu un compte](%%action.register%%) i sou el primer en "
"escriure-hi!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2537,7 +2883,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2572,7 +2918,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Núvol d'etiquetes"
@@ -2714,7 +3060,7 @@ msgstr "El codi d'invitació no és vàlid."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
@@ -2757,7 +3103,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correu electrònic"
@@ -2863,7 +3209,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del teu perfil en un altre servei de microblogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscriure's"
@@ -2906,7 +3252,7 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
msgid "You already repeated that notice."
msgstr "Ja heu blocat l'usuari."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetit"
@@ -2920,6 +3266,11 @@ msgstr "Repetit!"
msgid "Replies to %s"
msgstr "Respostes a %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Respostes a %1$s el %2$s!"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2963,6 +3314,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Respostes a %1$s el %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "S'ha suprimit l'estat."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2973,6 +3329,125 @@ msgstr "No pots enviar un missatge a aquest usuari."
msgid "User is already sandboxed."
msgstr "Un usuari t'ha bloquejat."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessions"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gestiona les sessions"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Depuració de la sessió"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Activa la sortida de depuració per a les sessions."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Desa els paràmetres del lloc"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Has d'haver entrat per a poder marxar d'un grup."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Avís sense perfil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nom"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Paginació"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descripció"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Autoria"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "N'estàs segur que vols eliminar aquesta notificació?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s's notes favorites"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "No s'han pogut recuperar els avisos preferits."
@@ -3022,17 +3497,22 @@ msgstr "És una forma de compartir allò que us agrada."
msgid "%s group"
msgstr "%s grup"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%s membre/s en el grup, pàgina %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Perfil del grup"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Avisos"
@@ -3078,10 +3558,6 @@ msgstr "(Cap)"
msgid "All members"
msgstr "Tots els membres"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Estadístiques"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "S'ha creat"
@@ -3139,6 +3615,11 @@ msgstr "Notificació publicada"
msgid " tagged %s"
msgstr "Aviso etiquetats amb %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s perfils blocats, pàgina %d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3164,27 +3645,27 @@ msgstr "Feed d'avisos de %s"
msgid "FOAF for %s"
msgstr "Safata de sortida per %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res "
"encara."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3193,7 +3674,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3203,7 +3684,7 @@ msgstr ""
"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
"ca.wikipedia.org/wiki/Microblogging) "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Repetició de %s"
@@ -3220,204 +3701,149 @@ msgstr "L'usuari ja està silenciat."
msgid "Basic settings for this StatusNet site."
msgstr "Paràmetres bàsic d'aquest lloc basat en l'StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "El nom del lloc ha de tenir una longitud superior a zero."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Heu de tenir una adreça electrònica de contacte vàlida"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, fuzzy, php-format
msgid "Unknown language \"%s\"."
msgstr "Llengua desconeguda «%s»"
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "General"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Nom del lloc"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "El nom del vostre lloc, com ara «El microblog de l'empresa»"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Adreça electrònica de contacte del vostre lloc"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Local"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Fus horari per defecte"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Fus horari per defecte del lloc; normalment UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Llengua per defecte del lloc"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Servidor"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Servidor central del lloc."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Accés"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Privat"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-"Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) "
-"visualitzar el lloc?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Només invitació"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Fes que el registre sigui només amb invitacions."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Tancat"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Inhabilita els nous registres."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Instantànies"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "En una tasca planificada"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Instantànies de dades"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Freqüència"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Les instantànies s'enviaran a aquest URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Límits"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Límits del text"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Límit de duplicats"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Quant de temps cal que esperin els usuaris (en segons) per enviar el mateix "
"de nou."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Desa els paràmetres del lloc"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "Configuració SMS"
+msgstr "Paràmetres de l'SMS"
#: actions/smssettings.php:69
#, php-format
@@ -3447,9 +3873,8 @@ msgid "Enter the code you received on your phone."
msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
-msgstr "Número de telèfon pels SMS"
+msgstr "Número de telèfon per als SMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3523,15 +3948,26 @@ msgstr "No hi ha cap codi entrat"
msgid "You are not subscribed to that profile."
msgstr "No estàs subscrit a aquest perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "No s'ha pogut guardar la subscripció."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "No existeix aquest usuari."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "No existeix el fitxer."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "No estàs subscrit a aquest perfil."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscrit"
@@ -3595,7 +4031,7 @@ msgstr "Aquestes són les persones que escoltes."
msgid "These are the people whose notices %s listens to."
msgstr "Aquestes són les persones que %s escolta."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3605,19 +4041,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s no escolta a ningú."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3647,7 +4088,8 @@ msgstr "Etiqueta %s"
msgid "User profile"
msgstr "Perfil de l'usuari"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3709,7 +4151,7 @@ msgstr "No id en el perfil sol·licitat."
msgid "Unsubscribed"
msgstr "No subscrit"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3724,84 +4166,64 @@ msgstr "Usuari"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Límit de la biografia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Límit màxim de la biografia d'un perfil (en caràcters)."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Usuaris nous"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Benvinguda als usuaris nous"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Subscripció per defecte"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Subscriviu automàticament els usuaris nous a aquest usuari."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Invitacions"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "S'han habilitat les invitacions"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessions"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Gestiona les sessions"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Depuració de la sessió"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Activa la sortida de depuració per a les sessions."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoritzar subscripció"
@@ -3817,36 +4239,36 @@ msgstr ""
"subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
"avisos de ningú, clica \"Cancel·lar\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Llicència"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Accepta"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Subscriure's a aquest usuari"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Rebutja"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Rebutja la subscripció"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Cap petició d'autorització!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Subscripció autoritzada"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3857,11 +4279,11 @@ msgstr ""
"Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
"El teu identificador de subscripció és:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Subscripció rebutjada"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3871,37 +4293,37 @@ msgstr ""
"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix "
"de nou les instruccions per a saber com rebutjar la subscripció completament."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "No es pot llegir l'URL de l'avatar '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Tipus d'imatge incorrecte per a '%s'"
@@ -3922,6 +4344,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Gaudiu de l'entrepà!"
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%s membre/s en el grup, pàgina %d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Cerca més grups"
@@ -3948,11 +4375,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "S'ha suprimit l'estat."
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Col·laboració"
@@ -3984,11 +4406,7 @@ msgstr ""
msgid "Plugins"
msgstr "Connectors"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nom"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Sessions"
@@ -3998,10 +4416,6 @@ msgstr "Sessions"
msgid "Author(s)"
msgstr "Autoria"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descripció"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4051,28 +4465,28 @@ msgstr "No s'ha pogut inserir el missatge."
msgid "Could not update message with new URI."
msgstr "No s'ha pogut inserir el missatge amb la nova URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Hashtag de l'error de la base de dades:%s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema al guardar la notificació. Usuari desconegut."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4081,34 +4495,60 @@ msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD en inserir resposta: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Se us ha banejat la subscripció."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Ja hi esteu subscrit!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Un usuari t'ha bloquejat."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "No estàs subscrit!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "No s'ha pogut eliminar la subscripció."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "No s'ha pogut eliminar la subscripció."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Us donem la benvinguda a %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "No s'ha pogut crear el grup."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "No s'ha pogut establir la pertinença d'aquest grup."
@@ -4150,129 +4590,125 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Pàgina sense titol"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Inici"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Compte"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Connexió"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "No s'ha pogut redirigir al servidor: %s"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convida"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amics i companys perquè participin a %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Finalitza la sessió"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crea un compte"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ajuda'm"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Cerca"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Avís del lloc"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistes locals"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Notificació pàgina"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Quant a"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Preguntes més freqüents"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privadesa"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Font"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacte"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Insígnia"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4281,12 +4717,12 @@ msgstr ""
"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** és un servei de microblogging."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4297,33 +4733,55 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "Tot "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "llicència."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Anteriors"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Ha ocorregut algun problema amb la teva sessió."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4357,10 +4815,104 @@ msgstr "Configuració bàsica del lloc"
msgid "Design configuration"
msgstr "Configuració del disseny"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Configuració dels camins"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Configuració del disseny"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Configuració dels camins"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Configuració del disseny"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Descriu el grup amb 140 caràcters"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Descriu el grup amb 140 caràcters"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Font"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL del teu web, blog del grup u tema"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL del teu web, blog del grup u tema"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Suprimeix"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Adjuncions"
@@ -4381,11 +4933,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr "Etiquetes de l'adjunció"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "El canvi de contrasenya ha fallat"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Contrasenya canviada."
@@ -4539,82 +5091,91 @@ msgstr "Problema en guardar l'avís."
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica el nom de l'usuari a que vols subscriure't"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "No existeix aquest usuari."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscrit a %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Has deixat d'estar subscrit a %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comanda encara no implementada."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificacions off."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "No es poden posar en off les notificacions."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificacions on."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Has deixat d'estar subscrit a %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No pots subscriure a un altre a tu mateix."
msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "No sou membre de cap grup."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "No sou un membre del grup."
-msgstr[1] "No sou un membre del grup."
+msgstr[0] "Sou un membre d'aquest grup:"
+msgstr[1] "Sou un membre d'aquests grups:"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4628,6 +5189,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4655,19 +5217,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "No s'ha trobat cap fitxer de configuració. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Podeu voler executar l'instal·lador per a corregir-ho."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Vés a l'instal·lador."
@@ -4683,6 +5245,14 @@ msgstr "Actualitzacions per Missatgeria Instantània"
msgid "Updates by SMS"
msgstr "Actualitzacions per SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Connexions"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Aplicacions de connexió autoritzades"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Error de la base de dades"
@@ -4742,9 +5312,8 @@ msgid "All"
msgstr "Tot"
#: lib/galleryaction.php:139
-#, fuzzy
msgid "Select tag to filter"
-msgstr "Selecciona un transport"
+msgstr "Seleccioneu l'etiqueta per filtrar"
#: lib/galleryaction.php:140
msgid "Tag"
@@ -4763,14 +5332,13 @@ msgid "URL of the homepage or blog of the group or topic"
msgstr "URL del teu web, blog del grup u tema"
#: lib/groupeditform.php:168
-#, fuzzy
msgid "Describe the group or topic"
-msgstr "Descriu el grup amb 140 caràcters"
+msgstr "Descriviu el grup o el tema"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "Descriu el grup amb 140 caràcters"
+msgstr "Descriviu el grup o el tema en %d caràcters"
#: lib/groupeditform.php:179
msgid ""
@@ -4792,9 +5360,9 @@ msgid "Blocked"
msgstr "Blocat"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Usuari bloquejat."
+msgstr "%susuaris blocats"
#: lib/groupnav.php:108
#, php-format
@@ -4811,9 +5379,9 @@ msgid "Add or edit %s logo"
msgstr "Afegir o editar logo %s"
#: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s design"
-msgstr "Afegir o editar logo %s"
+msgstr "Afegeix o edita el disseny %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4863,18 +5431,18 @@ msgstr "Tipus de fitxer desconegut"
#: lib/imagefile.php:217
msgid "MB"
-msgstr ""
+msgstr "MB"
#: lib/imagefile.php:219
msgid "kB"
-msgstr ""
+msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Llengua desconeguda «%s»"
@@ -5085,7 +5653,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5203,58 +5771,54 @@ msgid "Do not share my location"
msgstr "Comparteix la vostra ubicació"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "en context"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetit per"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "respondre a aquesta nota"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Respon"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Notificació publicada"
@@ -5288,11 +5852,7 @@ msgstr "Error en inserir perfil remot"
msgid "Duplicate notice"
msgstr "Eliminar nota."
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Se us ha banejat la subscripció."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "No s'ha pogut inserir una nova subscripció."
@@ -5308,19 +5868,19 @@ msgstr "Respostes"
msgid "Favorites"
msgstr "Preferits"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Safata d'entrada"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Els teus missatges rebuts"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Safata de sortida"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Els teus missatges enviats"
@@ -5400,6 +5960,10 @@ msgstr "Repeteix l'avís"
msgid "Repeat this notice"
msgstr "Repeteix l'avís"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5469,36 +6033,6 @@ msgstr "Persones subscrites a %s"
msgid "Groups %s is a member of"
msgstr "%s grups són membres de"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Ja hi esteu subscrit!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Un usuari t'ha bloquejat."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "No pots subscriure."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "No pots subscriure a un altre a tu mateix."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "No estàs subscrit!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5550,67 +6084,67 @@ msgstr "Edita l'avatar"
msgid "User actions"
msgstr "Accions de l'usuari"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Edita la configuració del perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Edita"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar un missatge directe a aquest usuari"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Missatge"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "fa un any"
@@ -5624,7 +6158,7 @@ msgstr "%s no és un color vàlid!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 6d4ee65b6..dd51424e6 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,17 +9,75 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:54+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:18+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Přijmout"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Nastavení"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Registrovat"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Soukromí"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr ""
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "Žádný takový uživatel."
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Uložit"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Nastavení"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -35,25 +93,29 @@ msgstr "Žádné takové oznámení."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Žádný takový uživatel."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s a přátelé"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -94,7 +156,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -106,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s a přátelé"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -117,23 +179,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Potvrzující kód nebyl nalezen"
@@ -148,7 +210,7 @@ msgstr "Potvrzující kód nebyl nalezen"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -179,8 +241,9 @@ msgstr "Nelze uložit profil"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -299,12 +362,12 @@ msgstr "Nelze aktualizovat uživatele"
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Nelze aktualizovat uživatele"
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Nelze aktualizovat uživatele"
@@ -327,7 +390,8 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou"
msgid "Not a valid nickname."
msgstr "Není platnou přezdívkou."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -339,7 +403,8 @@ msgstr "Stránka není platnou URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
@@ -375,7 +440,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Žádný požadavek nebyl nalezen!"
@@ -419,6 +484,116 @@ msgstr ""
msgid "groups on %s"
msgstr ""
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Neplatná velikost"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Neplatné jméno nebo heslo"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Chyba nastavení uživatele"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Chyba v DB při vkládání odpovědi: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "NeÄekaná forma submission."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+#, fuzzy
+msgid "Account"
+msgstr "O nás"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Přezdívka"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Heslo"
+
+#: actions/apioauthauthorize.php:328
+#, fuzzy
+msgid "Deny"
+msgstr "Vzhled"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -451,17 +626,17 @@ msgstr "Obrázek nahrán"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -476,7 +651,7 @@ msgstr "Nepodporovaný formát obrázku."
msgid "%1$s / Favorites from %2$s"
msgstr "%1 statusů na %2"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Mikroblog od %s"
@@ -487,7 +662,7 @@ msgstr "Mikroblog od %s"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -503,27 +678,22 @@ msgstr "%1 statusů na %2"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Odpovědi na %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Odpovědi na %s"
@@ -533,7 +703,7 @@ msgstr "Odpovědi na %s"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mikroblog od %s"
@@ -596,8 +766,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Odstranit"
@@ -609,29 +779,6 @@ msgstr "Upload"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "NeÄekaná forma submission."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -669,8 +816,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Ne"
@@ -679,13 +827,13 @@ msgstr "Ne"
msgid "Do not block this user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Ano"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
@@ -771,7 +919,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Nelze smazat potvrzení emailu"
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "PotvrÄ adresu"
#: actions/confirmaddress.php:159
@@ -789,10 +938,54 @@ msgstr "Umístění"
msgid "Notices"
msgstr "Sdělení"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Sdělení nemá profil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Žádné takové oznámení."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Žádné takové oznámení."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Odstranit toto oznámení"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -822,7 +1015,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Žádné takové oznámení."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Odstranit toto oznámení"
@@ -958,16 +1151,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Uložit"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -980,10 +1163,84 @@ msgstr ""
msgid "Add to favorites"
msgstr "Přidat do oblíbených"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Žádný takový dokument."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Sdělení nemá profil"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Žádné takové oznámení."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Přezdívku již někdo používá. Zkuste jinou"
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Odběry"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Stránka není platnou URL."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Nelze aktualizovat uživatele"
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1012,7 +1269,7 @@ msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
msgid "Could not update group."
msgstr "Nelze aktualizovat uživatele"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Nelze uložin informace o obrázku"
@@ -1053,7 +1310,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Zrušit"
@@ -1134,7 +1392,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
@@ -1146,7 +1404,7 @@ msgstr ""
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Nelze vložit potvrzující kód"
@@ -1205,7 +1463,7 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1360,7 +1618,7 @@ msgstr "Uživatel nemá profil."
msgid "User is not a member of group."
msgstr "Neodeslal jste nám profil"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Žádný takový uživatel."
@@ -1460,23 +1718,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1653,6 +1911,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Toto není váš Jabber"
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1729,7 +1992,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Odeslat"
@@ -1805,7 +2068,7 @@ msgstr "Neplatné jméno nebo heslo"
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
@@ -1814,17 +2077,6 @@ msgstr "Přihlásit"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Přezdívka"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Heslo"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Zapamatuj si mÄ›"
@@ -1853,21 +2105,21 @@ msgstr ""
"[Registrovat](%%action.register%%) nový úÄet, nebo vyzkouÅ¡ejte [OpenID](%%"
"action.openidlogin%%)."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "Uživatel nemá profil."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Nelze vytvořit OpenID z: %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Uživatel nemá profil."
@@ -1876,6 +2128,28 @@ msgstr "Uživatel nemá profil."
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Žádné takové oznámení."
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Nelze uložin informace o obrázku"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nová skupina"
@@ -1983,6 +2257,49 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Sdělení nemá profil"
@@ -2001,8 +2318,8 @@ msgstr "Připojit"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2016,7 +2333,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Nastavení"
#: actions/othersettings.php:71
@@ -2073,6 +2390,11 @@ msgstr "Neplatný obsah sdělení"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2145,7 +2467,7 @@ msgstr "Nelze uložit nové heslo"
msgid "Password saved."
msgstr "Heslo uloženo"
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2153,140 +2475,157 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "Obnovit"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Nové sdělení"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Obrázek"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Nastavení"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Obrázek nahrán"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Obrázek nahrán"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Obnovit"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Sdělení"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Obnovit"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Nové sdělení"
@@ -2350,7 +2689,7 @@ msgid "Full name"
msgstr "Celé jméno"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Moje stránky"
@@ -2373,7 +2712,7 @@ msgstr "O mÄ›"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Umístění"
@@ -2397,7 +2736,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Jazyk"
@@ -2423,7 +2762,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2436,25 +2775,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "Neplatná adresa '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Nastavení uloženo"
@@ -2476,39 +2815,39 @@ msgstr "Veřejné zprávy"
msgid "Public timeline"
msgstr "Veřejné zprávy"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Veřejný Stream Feed"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Veřejný Stream Feed"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Veřejný Stream Feed"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2517,7 +2856,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2551,7 +2890,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2690,7 +3029,7 @@ msgstr "Chyba v ověřovacím kódu"
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -2730,7 +3069,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2821,7 +3160,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Odebírat"
@@ -2862,7 +3201,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
msgid "You already repeated that notice."
msgstr "Již jste přihlášen"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Vytvořit"
@@ -2878,6 +3217,11 @@ msgstr "Vytvořit"
msgid "Replies to %s"
msgstr "Odpovědi na %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Odpovědi na %s"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2919,6 +3263,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Odpovědi na %s"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Obrázek nahrán"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2929,6 +3278,124 @@ msgstr "Neodeslal jste nám profil"
msgid "User is already sandboxed."
msgstr "Uživatel nemá profil."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Nastavení"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Sdělení nemá profil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Přezdívka"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Umístění"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Odběry"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistiky"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s a přátelé"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2978,18 +3445,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Všechny odběry"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "Žádné takové oznámení."
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Poznámka"
@@ -3036,10 +3508,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistiky"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3096,6 +3564,11 @@ msgstr "Sdělení"
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s a přátelé"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3121,25 +3594,25 @@ msgstr "Feed sdělení pro %s"
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3148,7 +3621,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3156,7 +3629,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Odpovědi na %s"
@@ -3174,204 +3647,147 @@ msgstr "Uživatel nemá profil."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Není platnou mailovou adresou."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Nové sdělení"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Žádný registrovaný email pro tohoto uživatele."
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Umístění"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Obnovit"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Přijmout"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Soukromí"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Žádný takový uživatel."
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Nastavení"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3473,17 +3889,27 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr "Neodeslal jste nám profil"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Nelze vytvořit odebírat"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Žádný takový uživatel."
+msgid "No such profile."
+msgstr "Žádné takové oznámení."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Odebírat"
@@ -3544,7 +3970,7 @@ msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
msgid "These are the people whose notices %s listens to."
msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3554,20 +3980,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1 od teÄ naslouchá tvým sdÄ›lením v %2"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "Žádné Jabber ID."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Mikroblog od %s"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3598,7 +4029,8 @@ msgstr ""
msgid "User profile"
msgstr "Uživatel nemá profil."
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3660,7 +4092,7 @@ msgstr "Nebylo vráceno žádné URL profilu od servu."
msgid "Unsubscribed"
msgstr "Odhlásit"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3675,87 +4107,67 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Všechny odběry"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "Odběr autorizován"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Umístění"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizovaný odběr"
@@ -3771,38 +4183,38 @@ msgstr ""
"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
"klikněte na \"Zrušit\""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licence"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Přijmout"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "Odběr autorizován"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Odmítnout"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Všechny odběry"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Žádné potvrení!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Odběr autorizován"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3813,11 +4225,11 @@ msgstr ""
"nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
"je:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Odběr odmítnut"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3827,37 +4239,37 @@ msgstr ""
"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. Zkontrolujte v "
"nápovědě jak správně postupovat při zamítání odběru"
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Nelze pÅ™eÄíst adresu obrázku '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Neplatný typ obrázku pro '%s'"
@@ -3877,6 +4289,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Všechny odběry"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3903,11 +4320,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Obrázek nahrán"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3939,12 +4351,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Přezdívka"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Osobní"
@@ -3953,11 +4360,6 @@ msgstr "Osobní"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Odběry"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4007,61 +4409,88 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Chyba v DB při vkládání odpovědi: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Uživatel nemá profil."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Nepřihlášen!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Nelze smazat odebírání"
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Nelze smazat odebírání"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Nelze uložin informace o obrázku"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Nelze vytvořit odebírat"
@@ -4105,135 +4534,130 @@ msgstr "%1 statusů na %2"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Domů"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "O nás"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Připojit"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Odběry"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Odhlásit"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "VytvoÅ™it nový úÄet"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Nápověda"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Pomoci mi!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Hledat"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "O nás"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Soukromí"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Zdroj"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4242,12 +4666,12 @@ msgstr ""
"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** je služba mikroblogů."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4258,35 +4682,57 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Starší »"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4319,11 +4765,105 @@ msgstr "Potvrzení emailové adresy"
msgid "Design configuration"
msgstr "Potvrzení emailové adresy"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Potvrzení emailové adresy"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Potvrzení emailové adresy"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "Potvrzení emailové adresy"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Potvrzení emailové adresy"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Zdroj"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Odstranit"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4344,12 +4884,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Heslo uloženo"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Heslo uloženo"
@@ -4505,86 +5045,96 @@ msgstr "Problém při ukládání sdělení"
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Žádný takový uživatel."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Odhlásit"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Vzdálený odběr"
msgstr[1] "Vzdálený odběr"
msgstr[2] ""
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4598,6 +5148,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4625,20 +5176,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Žádný potvrzující kód."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4654,6 +5205,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Připojit"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4844,12 +5404,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5053,7 +5613,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " od "
@@ -5174,60 +5734,56 @@ msgid "Do not share my location"
msgstr "Nelze uložit profil"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Žádný obsah!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Vytvořit"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "odpovÄ›Ä"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Sdělení"
@@ -5261,11 +5817,7 @@ msgstr "Chyba při vkládaní vzdáleného profilu"
msgid "Duplicate notice"
msgstr "Nové sdělení"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Nelze vložit odebírání"
@@ -5281,19 +5833,19 @@ msgstr "Odpovědi"
msgid "Favorites"
msgstr "Oblíbené"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5374,6 +5926,10 @@ msgstr "Odstranit toto oznámení"
msgid "Repeat this notice"
msgstr "Odstranit toto oznámení"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5446,37 +6002,6 @@ msgstr "Vzdálený odběr"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Uživatel nemá profil."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Nepřihlášen!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Nelze smazat odebírání"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Nelze smazat odebírání"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5529,68 +6054,68 @@ msgstr "Upravit avatar"
msgid "User actions"
msgstr "Akce uživatele"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Nastavené Profilu"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Zpráva"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "asi před rokem"
@@ -5604,7 +6129,7 @@ msgstr "Stránka není platnou URL."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index d8572b244..053187a86 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
# Author@translatewiki.net: Bavatar
# Author@translatewiki.net: Lutzgh
# Author@translatewiki.net: March
+# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Pill
# Author@translatewiki.net: Umherirrender
# --
@@ -12,17 +13,70 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:57+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:21+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Zugang"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Zugangseinstellungen speichern"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registrieren"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privat"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Anonymen (nicht eingeloggten) Nutzern das Betrachten der Seite verbieten?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Nur auf Einladung"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Registrierung nur bei vorheriger Einladung erlauben."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Geschlossen"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Neuregistrierungen deaktivieren."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Speichern"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Zugangs-Einstellungen speichern"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -37,25 +91,29 @@ msgstr "Seite nicht vorhanden"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Unbekannter Benutzer."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s und Freunde, Seite% 2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -103,7 +161,7 @@ msgstr ""
"posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit "
"zu erregen."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -117,8 +175,8 @@ msgstr ""
msgid "You and friends"
msgstr "Du und Freunde"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
@@ -128,23 +186,23 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-Methode nicht gefunden."
@@ -158,7 +216,7 @@ msgstr "API-Methode nicht gefunden."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Diese Methode benötigt ein POST."
@@ -187,8 +245,9 @@ msgstr "Konnte Profil nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -305,11 +364,11 @@ msgstr "Du kannst dich nicht selbst entfolgen!"
msgid "Two user ids or screen_names must be supplied."
msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Konnte öffentlichen Stream nicht abrufen."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Konnte keine Statusmeldungen finden."
@@ -333,7 +392,8 @@ msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
msgid "Not a valid nickname."
msgstr "Ungültiger Nutzername."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -346,7 +406,8 @@ msgstr ""
msgid "Full name is too long (max 255 chars)."
msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
@@ -382,7 +443,7 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Gruppe nicht gefunden!"
@@ -404,9 +465,9 @@ msgid "You are not a member of this group."
msgstr "Du bist kein Mitglied dieser Gruppe."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen."
+msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
#: actions/apigrouplist.php:95
#, php-format
@@ -423,6 +484,114 @@ msgstr "%s Gruppen"
msgid "groups on %s"
msgstr "Gruppen von %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Ungültige Größe."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Benutzername oder Passwort falsch."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Fehler bei den Nutzereinstellungen."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Unerwartete Formulareingabe."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nutzername"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Passwort"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Alle"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Diese Methode benötigt ein POST oder DELETE."
@@ -452,18 +621,18 @@ msgstr "Status gelöscht."
msgid "No status with that ID found."
msgstr "Keine Nachricht mit dieser ID gefunden."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Nicht gefunden"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -479,7 +648,7 @@ msgstr "Bildformat wird nicht unterstützt."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favoriten von %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s Aktualisierung in den Favoriten von %s / %s."
@@ -490,7 +659,7 @@ msgstr "%s Aktualisierung in den Favoriten von %s / %s."
msgid "%s timeline"
msgstr "%s Zeitleiste"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -506,27 +675,22 @@ msgstr "%1$s / Aktualisierungen erwähnen %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s öffentliche Zeitleiste"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Nachrichten von allen!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Von %s wiederholt"
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Antworten an %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Antworten an %s"
@@ -536,7 +700,7 @@ msgstr "Antworten an %s"
msgid "Notices tagged with %s"
msgstr "Nachrichten, die mit %s getagt sind"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualisierungen mit %1$s getagt auf %2$s!"
@@ -597,8 +761,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Vorschau"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Löschen"
@@ -610,29 +774,6 @@ msgstr "Hochladen"
msgid "Crop"
msgstr "Zuschneiden"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Unerwartete Formulareingabe."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -669,8 +810,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Nein"
@@ -678,13 +820,13 @@ msgstr "Nein"
msgid "Do not block this user"
msgstr "Diesen Benutzer freigeben"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
@@ -767,7 +909,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Konnte E-Mail-Bestätigung nicht löschen."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Adresse bestätigen"
#: actions/confirmaddress.php:159
@@ -784,10 +927,54 @@ msgstr "Unterhaltung"
msgid "Notices"
msgstr "Nachrichten"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Nachricht hat kein Profil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Es gab ein Problem mit deinem Sessiontoken."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Unbekannte Nachricht."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Diese Nachricht nicht löschen"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Nachricht löschen"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -818,7 +1005,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
msgid "Do not delete this notice"
msgstr "Diese Nachricht nicht löschen"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Nachricht löschen"
@@ -948,16 +1135,6 @@ msgstr "Standard-Design wiederherstellen"
msgid "Reset back to default"
msgstr "Standard wiederherstellen"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Speichern"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Design speichern"
@@ -970,10 +1147,88 @@ msgstr "Diese Nachricht ist kein Favorit!"
msgid "Add to favorites"
msgstr "Zu Favoriten hinzufügen"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Unbekanntes Dokument."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Sonstige Optionen"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Unbekannte Nachricht."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Beschreibung"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr ""
+"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Konnte Gruppe nicht aktualisieren."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1002,7 +1257,7 @@ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
msgid "Could not update group."
msgstr "Konnte Gruppe nicht aktualisieren."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Konnte keinen Favoriten erstellen."
@@ -1044,7 +1299,8 @@ msgstr ""
"(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Abbrechen"
@@ -1129,7 +1385,7 @@ msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
@@ -1141,7 +1397,7 @@ msgstr "Dies ist bereits deine E-Mail-Adresse."
msgid "That email address already belongs to another user."
msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Konnte keinen Bestätigungscode einfügen."
@@ -1203,7 +1459,7 @@ msgstr "Diese Nachricht ist bereits ein Favorit!"
msgid "Disfavor favorite"
msgstr "Aus Favoriten entfernen"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Beliebte Nachrichten"
@@ -1345,7 +1601,7 @@ msgstr "Dieser Nutzer ist bereits von der Gruppe gesperrt"
msgid "User is not a member of group."
msgstr "Nutzer ist kein Mitglied dieser Gruppe."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Benutzerzugang zu der Gruppe blockieren"
@@ -1440,23 +1696,23 @@ 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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blockieren"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Zum Admin ernennen"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Diesen Benutzer zu einem Admin ernennen"
@@ -1636,6 +1892,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Dies ist nicht deine JabberID."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Posteingang von %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1723,7 +1984,7 @@ msgstr ""
"Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
"anfügen."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Senden"
@@ -1823,7 +2084,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Anmelden"
@@ -1832,17 +2093,6 @@ msgstr "Anmelden"
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Nutzername"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Passwort"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Anmeldedaten merken"
@@ -1872,21 +2122,21 @@ msgstr ""
"Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
"[Registriere](%%action.register%%) ein neues Konto."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%s ist bereits ein Administrator der Gruppe „%s“."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Konnte %s nicht zum Administrator der Gruppe %s machen"
@@ -1895,6 +2145,30 @@ msgstr "Konnte %s nicht zum Administrator der Gruppe %s machen"
msgid "No current status"
msgstr "Kein aktueller Status"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Unbekannte Nachricht."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Konnte keinen Favoriten erstellen."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Neue Gruppe"
@@ -2005,6 +2279,51 @@ msgstr "Stups abgeschickt"
msgid "Nudge sent!"
msgstr "Stups gesendet!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Sonstige Optionen"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Nachricht hat kein Profil"
@@ -2022,8 +2341,8 @@ msgstr "Content-Typ "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2036,7 +2355,7 @@ msgid "Notice Search"
msgstr "Nachrichtensuche"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Andere Einstellungen"
#: actions/othersettings.php:71
@@ -2061,16 +2380,15 @@ msgstr "Profil-Einstellungen ansehen"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Prifil-Designs anzeigen oder verstecken."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (max. 50 Zeichen)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Keine Gruppe angegeben"
+msgstr "Keine Benutzer ID angegeben"
#: actions/otp.php:83
#, fuzzy
@@ -2092,6 +2410,11 @@ msgstr "Token ungültig oder abgelaufen."
msgid "Login token expired."
msgstr "An Seite anmelden"
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Postausgang für %1$s - Seite %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2163,7 +2486,7 @@ msgstr "Konnte neues Passwort nicht speichern"
msgid "Password saved."
msgstr "Passwort gespeichert."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2171,134 +2494,148 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Theme-Verzeichnis nicht lesbar: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ungültiger SSL-Server. Die maximale Länge ist 255 Zeichen."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Seite"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Server"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Server Name der Seite"
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Pfad"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Seitenpfad"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Schicke URLs."
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Theme-Verzeichnis"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatare"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Avatar-Server"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Avatarpfad"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Avatarverzeichnis"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
-msgstr ""
+msgstr "Hintergrundbilder"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
-msgstr ""
+msgstr "Server für Hintergrundbilder"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
-msgstr ""
+msgstr "Pfad zu den Hintergrundbildern"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Hintergrund Verzeichnis"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
-#, fuzzy
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
-msgstr "Wiederherstellung"
+msgstr "Nie"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Manchmal"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Immer"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "SSL verwenden"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Wann soll SSL verwendet werden"
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-Server"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Server an den SSL Anfragen gerichtet werden sollen"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Speicherpfade"
@@ -2322,20 +2659,20 @@ msgid "Not a valid people tag: %s"
msgstr "Ungültiger Personen-Tag: %s"
#: actions/peopletag.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
+msgstr "Benutzer die sich selbst mit %1$s getagged haben - Seite %2$d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
msgstr "Ungültiger Nachrichteninhalt"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Die Nachrichtenlizenz '%s' ist nicht kompatibel mit der Lizenz der Seite '%"
-"s'."
+"Die Nachrichtenlizenz '%1$s' ist nicht kompatibel mit der Lizenz der Seite '%"
+"2$s'."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2363,7 +2700,7 @@ msgid "Full name"
msgstr "Vollständiger Name"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
@@ -2387,7 +2724,7 @@ msgstr "Biografie"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Aufenthaltsort"
@@ -2398,7 +2735,7 @@ msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Teile meine aktuelle Position wenn ich Nachrichten sende"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2413,7 +2750,7 @@ msgstr ""
"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
"Leerzeichen getrennt"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Sprache"
@@ -2441,7 +2778,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. %d Zeichen)"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Keine Zeitzone ausgewählt."
@@ -2454,31 +2791,30 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
msgid "Invalid tag: \"%s\""
msgstr "Ungültiger Tag: „%s“"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Autosubscribe konnte nicht aktiviert werden."
-#: actions/profilesettings.php:359
-#, fuzzy
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr "Konnte Tags nicht speichern."
+msgstr "Konnte Positions-Einstellungen nicht speichern."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Konnte Profil nicht speichern."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Konnte Tags nicht speichern."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Jenseits des Seitenlimits (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -2493,36 +2829,38 @@ msgstr "Öffentliche Zeitleiste, Seite %d"
msgid "Public timeline"
msgstr "Öffentliche Zeitleiste"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Feed des öffentlichen Streams (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Feed des öffentlichen Streams (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Feed des öffentlichen Streams (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Dies ist die öffentliche Zeitlinie von %%site.name%% es wurde allerdings "
+"noch nichts gepostet."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
-msgstr ""
+msgstr "Sei der erste der etwas schreibt!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2531,7 +2869,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2555,6 +2893,8 @@ msgstr "Das sind die beliebtesten Tags auf %s "
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
+"Bis jetzt hat noch niemand eine Nachricht mit dem Tag [hashtag](%%doc.tags%"
+"%) gepostet."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -2567,7 +2907,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Tag-Wolke"
@@ -2615,7 +2955,7 @@ msgstr ""
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Spitzname oder e-mail Adresse"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -2705,7 +3045,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -2748,7 +3088,7 @@ msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-Mail"
@@ -2857,7 +3197,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abonnieren"
@@ -2879,27 +3219,23 @@ msgid "Couldn’t get a request token."
msgstr "Konnte keinen Anfrage-Token bekommen."
#: actions/repeat.php:57
-#, fuzzy
msgid "Only logged-in users can repeat notices."
-msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
+msgstr "Nur angemeldete Nutzer können Nachrichten wiederholen."
#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
msgid "No notice specified."
-msgstr "Kein Profil angegeben."
+msgstr "Keine Nachricht angegeen."
#: actions/repeat.php:76
-#, fuzzy
msgid "You can't repeat your own notice."
-msgstr ""
-"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
+msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
#: actions/repeat.php:90
#, fuzzy
msgid "You already repeated that notice."
msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Erstellt"
@@ -2915,6 +3251,11 @@ msgstr "Erstellt"
msgid "Replies to %s"
msgstr "Antworten an %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Antworten an %1$s, Seite %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2961,6 +3302,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Antworten an %1$s auf %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2971,6 +3316,125 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
msgid "User is already sandboxed."
msgstr "Dieser Benutzer hat dich blockiert."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Design-Einstellungen für diese StatusNet-Website."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Site-Einstellungen speichern"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Nachricht hat kein Profil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Name"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Seitenerstellung"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beschreibung"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistiken"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Autor"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%ss favorisierte Nachrichten"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Konnte Favoriten nicht abrufen."
@@ -3013,24 +3477,29 @@ msgstr ""
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Dies ist ein Weg Dinge zu teilen die dir gefallen."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
msgstr "%s Gruppe"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%s Gruppen-Mitglieder, Seite %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Gruppenprofil"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Nachricht"
@@ -3076,10 +3545,6 @@ msgstr "(Kein)"
msgid "All members"
msgstr "Alle Mitglieder"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistiken"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Erstellt"
@@ -3138,6 +3603,11 @@ msgstr "Nachricht gelöscht."
msgid " tagged %s"
msgstr "Nachrichten, die mit %s getagt sind"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s blockierte Benutzerprofile, Seite %d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3163,20 +3633,20 @@ msgstr "Feed der Nachrichten von %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF von %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas "
"gepostet."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, fuzzy, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3186,7 +3656,7 @@ msgstr ""
"posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit "
"zu erregen."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3195,7 +3665,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3206,224 +3676,162 @@ msgstr ""
"(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der Freien "
"Software [StatusNet](http://status.net/). "
-#: actions/showstream.php:313
-#, fuzzy, php-format
+#: actions/showstream.php:305
+#, php-format
msgid "Repeat of %s"
-msgstr "Antworten an %s"
+msgstr "Wiederholung von %s"
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+msgstr "Du kannst Nutzer dieser Seite nicht ruhig stellen."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Dieser Benutzer hat dich blockiert."
+msgstr "Nutzer ist bereits ruhig gestellt."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Grundeinstellungen für diese StatusNet Seite."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Der Seiten Name darf nicht leer sein."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
-msgstr "Du musst eine gültige E-Mail-Adresse haben"
+msgstr "Du musst eine gültige E-Mail-Adresse haben."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
msgstr "Unbekannte Sprache „%s“"
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "Minimale Textlänge ist 140 Zeichen."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
-#, fuzzy
+#: actions/siteadminpanel.php:242
msgid "Site name"
-msgstr "Seitennachricht"
+msgstr "Seitenname"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Der Name deiner Seite, sowas wie \"DeinUnternehmen Mircoblog\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Kontakt-E-Mail-Adresse für Deine Site."
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Lokale Ansichten"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "Bevorzugte Sprache"
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Wiederherstellung"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Schicke URLs."
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?"
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Akzeptieren"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Privatsphäre"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Einladen"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Blockieren"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frequenz"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Site-Einstellungen speichern"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3531,15 +3939,26 @@ msgstr "Kein Code eingegeben"
msgid "You are not subscribed to that profile."
msgstr "Du hast dieses Profil nicht abonniert."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Konnte Abonnement nicht erstellen."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Kein lokaler Benutzer."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Datei nicht gefunden."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Du hast dieses Profil nicht abonniert."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonniert"
@@ -3549,9 +3968,9 @@ msgid "%s subscribers"
msgstr "%s Abonnenten"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s Abonnenten, Seite %d"
+msgstr "%1$s Abonnenten, Seite %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3590,9 +4009,9 @@ msgid "%s subscriptions"
msgstr "%s Abonnements"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%s Abonnements, Seite %d"
+msgstr "%1$s Abonnements, Seite %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -3603,7 +4022,7 @@ msgstr "Dies sind die Leute, deren Nachrichten du liest."
msgid "These are the people whose notices %s listens to."
msgstr "Dies sind die Leute, deren Nachrichten %s liest."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3613,33 +4032,38 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s liest ab sofort "
+msgstr "%s hat niemanden abonniert."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Mit %1$s gekennzeichnete Nachrichten, Seite %2$d"
+
#: actions/tag.php:86
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichten Feed für Tag %s (RSS 1.0)"
#: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichten Feed für Tag %s (RSS 2.0)"
#: actions/tag.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichten Feed für Tag %s (Atom)"
#: actions/tagother.php:39
#, fuzzy
@@ -3655,7 +4079,8 @@ msgstr "Tag %s"
msgid "User profile"
msgstr "Benutzerprofil"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3706,9 +4131,8 @@ msgid "User is not sandboxed."
msgstr "Dieser Benutzer hat dich blockiert."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Benutzer hat kein Profil."
+msgstr "Der Benutzer ist nicht ruhig gestellt."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3718,7 +4142,7 @@ msgstr "Keine Profil-ID in der Anfrage."
msgid "Unsubscribed"
msgstr "Abbestellt"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, fuzzy, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3733,91 +4157,65 @@ msgstr "Benutzer"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Nutzer Einstellungen dieser StatusNet Seite."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Das Zeichenlimit der Biografie muss numerisch sein!"
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Neue Nutzer"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Willkommens-Nachricht für neue Nutzer (maximal 255 Zeichen)."
-#: actions/useradminpanel.php:241
-#, fuzzy
+#: actions/useradminpanel.php:240
msgid "Default subscription"
-msgstr "Alle Abonnements"
+msgstr "Standard Abonnement"
-#: actions/useradminpanel.php:242
-#, fuzzy
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
-"Menschen)"
+msgstr "Neue Nutzer abonnieren automatisch diesen Nutzer"
-#: actions/useradminpanel.php:251
-#, fuzzy
+#: actions/useradminpanel.php:250
msgid "Invitations"
-msgstr "Einladung(en) verschickt"
+msgstr "Einladungen"
-#: actions/useradminpanel.php:256
-#, fuzzy
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
-msgstr "Einladung(en) verschickt"
+msgstr "Einladungen aktivieren"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
-msgstr ""
-
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Ist es Nutzern erlaubt neue Nutzer einzuladen."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3833,38 +4231,37 @@ msgstr ""
"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
"„Abbrechen“."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Lizenz"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Akzeptieren"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
-#, fuzzy
msgid "Subscribe to this user"
msgstr "Abonniere diesen Benutzer"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Ablehnen"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "%s Abonnements"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Keine Bestätigungsanfrage!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Abonnement autorisiert"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3875,11 +4272,11 @@ msgstr ""
"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
"bestätigt werden. Dein Abonnement-Token ist:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Abonnement abgelehnt"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3890,37 +4287,37 @@ msgstr ""
"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
"vollständig abgelehnt werden. Dein Abonnement-Token ist:"
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Konnte Avatar-URL nicht öffnen „%s“"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Falscher Bildtyp für „%s“"
@@ -3939,6 +4336,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%s Gruppen-Mitglieder, Seite %d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Suche nach weiteren Gruppen"
@@ -3965,11 +4367,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Status gelöscht."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4001,12 +4398,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Nutzername"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Eigene"
@@ -4016,10 +4408,6 @@ msgstr "Eigene"
msgid "Author(s)"
msgstr "Autor"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beschreibung"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4070,27 +4458,27 @@ msgstr "Konnte Nachricht nicht einfügen."
msgid "Could not update message with new URI."
msgstr "Konnte Nachricht nicht mit neuer URI versehen."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4099,35 +4487,61 @@ msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Bereits abonniert!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Dieser Benutzer hat dich blockiert."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Nicht abonniert!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Konnte Abonnement nicht löschen."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Konnte Abonnement nicht löschen."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Herzlich willkommen bei %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Konnte Gruppe nicht erstellen."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
@@ -4169,131 +4583,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Seite ohne Titel"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Hauptnavigation"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Startseite"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Konto"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Verbinden"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Konnte nicht zum Server umleiten: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Hauptnavigation"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Einladen"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Abmelden"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Neues Konto erstellen"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hilfe"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Suchen"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Seitennachricht"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokale Ansichten"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Neue Nachricht"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Unternavigation"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Über"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "AGB"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privatsphäre"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Quellcode"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Stups"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4302,12 +4712,12 @@ msgstr ""
"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4318,34 +4728,56 @@ msgstr ""
"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Später"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Vorher"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Es gab ein Problem mit deinem Sessiontoken."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4379,11 +4811,105 @@ msgstr "Bestätigung der E-Mail-Adresse"
msgid "Design configuration"
msgstr "SMS-Konfiguration"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS-Konfiguration"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS-Konfiguration"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS-Konfiguration"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS-Konfiguration"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Quellcode"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Entfernen"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Anhänge"
@@ -4404,12 +4930,12 @@ msgstr "Nachrichten in denen dieser Anhang erscheint"
msgid "Tags for this attachment"
msgstr "Tags für diesen Anhang"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Passwort geändert"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Passwort geändert"
@@ -4559,81 +5085,90 @@ msgstr "Problem beim Speichern der Nachricht."
msgid "Specify the name of the user to subscribe to"
msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Unbekannter Benutzer."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%s abonniert"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s nicht mehr abonniert"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Befehl noch nicht implementiert."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Benachrichtigung deaktiviert."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Konnte Benachrichtigung nicht deaktivieren."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Benachrichtigung aktiviert."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s nicht mehr abonniert"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du hast diese Benutzer bereits abonniert:"
msgstr[1] "Du hast diese Benutzer bereits abonniert:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Niemand hat Dich abonniert."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Du bist in keiner Gruppe Mitglied."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Du bist kein Mitglied dieser Gruppe."
-msgstr[1] "Du bist kein Mitglied dieser Gruppe."
+msgstr[0] "Du bist Mitglied dieser Gruppe:"
+msgstr[1] "Du bist Mitglied dieser Gruppen:"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4647,6 +5182,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4674,19 +5210,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Keine Konfigurationsdatei gefunden."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Auf der Seite anmelden"
@@ -4703,6 +5239,15 @@ msgstr "Aktualisierungen via Instant Messenger (IM)"
msgid "Updates by SMS"
msgstr "Aktualisierungen via SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Verbinden"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Datenbankfehler."
@@ -4738,19 +5283,19 @@ msgstr "Zu Favoriten hinzufügen"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/feedlist.php:64
msgid "Export data"
@@ -4817,12 +5362,12 @@ msgid "Blocked"
msgstr "Blockiert"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Benutzer blockieren"
+msgstr "in %s blockierte Nutzer"
#: lib/groupnav.php:108
-#, fuzzy, php-format
+#, php-format
msgid "Edit %s group properties"
msgstr "%s Gruppeneinstellungen bearbeiten"
@@ -4831,14 +5376,14 @@ msgid "Logo"
msgstr "Logo"
#: lib/groupnav.php:114
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s logo"
msgstr "%s Logo hinzufügen oder bearbeiten"
#: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s design"
-msgstr "%s Logo hinzufügen oder bearbeiten"
+msgstr "%s Design hinzufügen oder bearbeiten"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4849,7 +5394,7 @@ msgid "Groups with most posts"
msgstr "Gruppen mit den meisten Beiträgen"
#: lib/grouptagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
msgid "Tags in %s group's notices"
msgstr "Tags in den Nachrichten der Gruppe %s"
@@ -4888,18 +5433,18 @@ msgstr "Unbekannter Dateityp"
#: lib/imagefile.php:217
msgid "MB"
-msgstr ""
+msgstr "MB"
#: lib/imagefile.php:219
msgid "kB"
-msgstr ""
+msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Unbekannte Sprache „%s“"
@@ -4913,14 +5458,12 @@ msgid "Leave"
msgstr "Verlassen"
#: lib/logingroupnav.php:80
-#, fuzzy
msgid "Login with a username and password"
-msgstr "Anmelden mit einem Benutzernamen und Passwort"
+msgstr "Mit Nutzernamen und Passwort anmelden"
#: lib/logingroupnav.php:86
-#, fuzzy
msgid "Sign up for a new account"
-msgstr "Für ein neues Konto registrieren"
+msgstr "Registriere ein neues Nutzerkonto"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -4988,11 +5531,9 @@ msgstr ""
"$s ändern.\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Biografie: %s\n"
-"\n"
+msgstr "Biografie: %s"
#: lib/mail.php:286
#, php-format
@@ -5158,8 +5699,7 @@ msgstr ""
"schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir "
"Nachrichten schicken, die nur Du sehen kannst."
-#: lib/mailbox.php:227 lib/noticelist.php:477
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "von"
@@ -5180,39 +5720,45 @@ msgid "Sorry, no incoming email allowed."
msgstr "Sorry, keinen eingehenden E-Mails gestattet."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Bildformat wird nicht unterstützt."
+msgstr "Nachrichten-Typ %s wird nicht unterstützt."
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Beim Speichern der Datei trat ein Datenbank Fehler auf. Bitte versuche es "
+"noch einmal."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
+"Die Größe der hoch geladenen Datei überschreitet die upload_max_filesize "
+"Angabe in der php.ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"Die Größe der hoch geladenen Datei überschreitet die MAX_FILE_SIZE Angabe, "
+"die im HTML Formular angegeben wurde."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Die Datei wurde nur teilweise auf den Server geladen."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Kein temporäres Verzeichnis gefunden."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Konnte die Datei nicht auf die Festplatte schreiben."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Upload der Datei wurde wegen der Dateiendung gestoppt."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
@@ -5238,7 +5784,6 @@ msgid "%s is not a supported file type on this server."
msgstr ""
#: lib/messageform.php:120
-#, fuzzy
msgid "Send a direct notice"
msgstr "Versende eine direkte Nachricht"
@@ -5247,14 +5792,12 @@ msgid "To"
msgstr "An"
#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
msgid "Available characters"
msgstr "Verfügbare Zeichen"
#: lib/noticeform.php:160
-#, fuzzy
msgid "Send a notice"
-msgstr "Nachricht versenden"
+msgstr "Nachricht senden"
#: lib/noticeform.php:173
#, php-format
@@ -5270,72 +5813,63 @@ msgid "Attach a file"
msgstr ""
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Konnte Tags nicht speichern."
+msgstr "Teile meinen Aufenthaltsort"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Konnte Tags nicht speichern."
+msgstr "Teile meinen Aufenthaltsort nicht"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
-#, fuzzy
+#: lib/noticelist.php:430
msgid "N"
-msgstr "Nein"
+msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
-msgstr ""
+msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
-msgstr ""
+msgstr "O"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
-msgstr ""
+msgstr "W"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "im Zusammenhang"
-#: lib/noticelist.php:556
-#, fuzzy
+#: lib/noticelist.php:583
msgid "Repeated by"
-msgstr "Erstellt"
+msgstr "Wiederholt von"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Antworten"
-#: lib/noticelist.php:628
-#, fuzzy
+#: lib/noticelist.php:655
msgid "Notice repeated"
-msgstr "Nachricht gelöscht."
+msgstr "Nachricht wiederholt"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -5366,12 +5900,7 @@ msgstr "Fehler beim Einfügen des entfernten Profils"
msgid "Duplicate notice"
msgstr "Notiz löschen"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Konnte neues Abonnement nicht eintragen."
@@ -5387,24 +5916,24 @@ msgstr "Antworten"
msgid "Favorites"
msgstr "Favoriten"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Posteingang"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Deine eingehenden Nachrichten"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Postausgang"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Deine gesendeten Nachrichten"
#: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
msgid "Tags in %s's notices"
msgstr "Tags in %ss Nachrichten"
@@ -5471,24 +6000,24 @@ msgid "Popular"
msgstr "Beliebt"
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "Auf diese Nachricht antworten"
+msgstr "Diese Nachricht wiederholen?"
#: lib/repeatform.php:132
-#, fuzzy
msgid "Repeat this notice"
-msgstr "Auf diese Nachricht antworten"
+msgstr "Diese Nachricht wiederholen"
+
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Posteingang"
+msgstr "Spielwiese"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Benutzer freigeben"
+msgstr "Diesen Nutzer auf die Spielwiese setzen"
#: lib/searchaction.php:120
msgid "Search site"
@@ -5528,14 +6057,12 @@ msgid "More..."
msgstr ""
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Seitennachricht"
+msgstr "Stummschalten"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Benutzer blockieren"
+msgstr "Nutzer verstummen lassen"
#: lib/subgroupnav.php:83
#, php-format
@@ -5552,36 +6079,6 @@ msgstr "Leute, die %s abonniert haben"
msgid "Groups %s is a member of"
msgstr "Gruppen in denen %s Mitglied ist"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Bereits abonniert!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Dieser Benutzer hat dich blockiert."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Konnte nicht abbonieren."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Nicht abonniert!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Konnte Abonnement nicht löschen."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Konnte Abonnement nicht löschen."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5602,19 +6099,17 @@ msgstr "Top-Schreiber"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Von Spielwiese freigeben"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
msgstr "Benutzer freigeben"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Stummschalten aufheben"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
msgstr "Benutzer freigeben"
@@ -5634,67 +6129,67 @@ msgstr "Avatar bearbeiten"
msgid "User actions"
msgstr "Benutzeraktionen"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Profil Einstellungen ändern"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Direkte Nachricht an Benutzer verschickt"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Nachricht"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
-msgstr ""
+msgstr "Moderieren"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -5708,7 +6203,8 @@ msgstr "%s ist keine gültige Farbe!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
-#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#: lib/xmppmanager.php:402
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet"
+msgstr ""
+"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 2f9257945..6ff718d45 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -9,21 +9,76 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:00+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:24+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "ΠÏόσβαση"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "ΠεÏιγÏαφή"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr ""
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr ""
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr ""
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Ρυθμίσεις OpenID"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
-msgstr "Δεν υπάÏχει τέτοιο σελίδα."
+msgstr "Δεν υπάÏχει τέτοια σελίδα"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -34,25 +89,29 @@ msgstr "Δεν υπάÏχει τέτοιο σελίδα."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Κανένας τέτοιος χÏήστης."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s και οι φίλοι του/της"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -93,7 +152,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +163,8 @@ msgstr ""
msgid "You and friends"
msgstr "Εσείς και οι φίλοι σας"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -115,23 +174,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
@@ -146,7 +205,7 @@ msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -177,8 +236,9 @@ msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -204,7 +264,7 @@ msgstr "Απέτυχε η ενημέÏωση του χÏήστη."
#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
-msgstr "Δεν μποÏείτε να εμποδίσετε τον εαυτό σας!"
+msgstr "Δεν μποÏείτε να κάνετε φÏαγή στον εαυτό σας!"
#: actions/apiblockcreate.php:126
msgid "Block user failed."
@@ -296,12 +356,12 @@ msgstr "Δεν μποÏείτε να εμποδίσετε τον εαυτό σα
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Απέτυχε η ενημέÏωση του χÏήστη."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Απέτυχε η εÏÏεση οποιασδήποτε κατάστασης."
@@ -324,7 +384,8 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χÏήση. ΔοκιμάÏ
msgid "Not a valid nickname."
msgstr ""
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -336,7 +397,8 @@ msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Το ονοματεπώνυμο είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 255 χαÏακτ.)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Η πεÏιγÏαφή είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο %d χαÏακτ.)."
@@ -372,9 +434,9 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
-msgstr "Ομάδα δεν βÏέθηκε!"
+msgstr "Η ομάδα δεν βÏέθηκε!"
#: actions/apigroupjoin.php:110 actions/joingroup.php:90
msgid "You are already a member of that group."
@@ -413,6 +475,113 @@ msgstr ""
msgid "groups on %s"
msgstr "ομάδες του χÏήστη %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Μήνυμα"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr ""
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "ΛογαÏιασμός"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Κωδικός"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -438,23 +607,23 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος
#: actions/apistatusesshow.php:138
msgid "Status deleted."
-msgstr "Η κατάσταση διαγÏάφεται."
+msgstr "Η κατάσταση διεγÏάφη."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -468,7 +637,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -479,7 +648,7 @@ msgstr ""
msgid "%s timeline"
msgstr "χÏονοδιάγÏαμμα του χÏήστη %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -495,27 +664,22 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -525,7 +689,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -585,8 +749,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "ΔιαγÏαφή"
@@ -598,29 +762,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -658,8 +799,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Όχι"
@@ -668,13 +810,13 @@ msgstr "Όχι"
msgid "Do not block this user"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
-msgstr "Îαί"
+msgstr "Îαι"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr ""
@@ -758,7 +900,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Απέτυχε η διαγÏαφή email επιβεβαίωσης."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Επιβεβαίωση διεÏθυνσης"
#: actions/confirmaddress.php:159
@@ -775,10 +918,54 @@ msgstr "Συζήτηση"
msgid "Notices"
msgstr ""
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Ο κωδικός επιβεβαίωσης δεν βÏέθηκε."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Ομάδες με τα πεÏισσότεÏα μέλη"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Δεν υπάÏχει τέτοιο σελίδα."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -809,7 +996,7 @@ msgstr "Είσαι σίγουÏος ότι θες να διαγÏάψεις αυ
msgid "Do not delete this notice"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -941,16 +1128,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -963,10 +1140,84 @@ msgstr ""
msgid "Add to favorites"
msgstr ""
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr ""
+
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Δεν υπάÏχει τέτοιο σελίδα."
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Δεν υπάÏχει τέτοιο σελίδα."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Το ονοματεπώνυμο είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 255 χαÏακτ.)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Το ψευδώνυμο είναι ήδη σε χÏήση. Δοκιμάστε κάποιο άλλο."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "ΠεÏιγÏαφή"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
msgstr ""
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Η τοποθεσία είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο 255 χαÏακτ.)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -995,7 +1246,7 @@ msgstr "Το βιογÏαφικό είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστ
msgid "Could not update group."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
@@ -1039,7 +1290,8 @@ msgstr ""
"φάκελο spam!) για μήνυμα με πεÏαιτέÏω οδηγίες. "
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "ΑκÏÏωση"
@@ -1120,7 +1372,7 @@ msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr ""
@@ -1132,7 +1384,7 @@ msgstr ""
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Απέτυχε η εισαγωγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚."
@@ -1194,7 +1446,7 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr ""
@@ -1341,7 +1593,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr ""
@@ -1435,24 +1687,24 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "ΔιαχειÏιστής"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
#, fuzzy
msgid "Make Admin"
msgstr "ΔιαχειÏιστής"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1620,6 +1872,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr ""
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1696,7 +1953,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr ""
@@ -1770,7 +2027,7 @@ msgstr "Λάθος όνομα χÏήστη ή κωδικός"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ΣÏνδεση"
@@ -1779,17 +2036,6 @@ msgstr "ΣÏνδεση"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Ψευδώνυμο"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Κωδικός"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr ""
@@ -1820,21 +2066,21 @@ msgstr ""
"ακόμα; Κάντε [εγγÏαφή](%%action.register%%) για ένα νέο λογαÏιασμό ή "
"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
@@ -1843,6 +2089,28 @@ msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Δεν υπάÏχει τέτοιο σελίδα."
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -1947,6 +2215,49 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Δεν είστε μέλος καμίας ομάδας."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr ""
@@ -1965,8 +2276,8 @@ msgstr "ΣÏνδεση"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -1980,7 +2291,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Ρυθμίσεις OpenID"
#: actions/othersettings.php:71
@@ -2035,6 +2346,11 @@ msgstr "Μήνυμα"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2107,7 +2423,7 @@ msgstr "ΑδÏνατη η αποθήκευση του νέου κωδικοÏ"
msgid "Password saved."
msgstr "Ο κωδικός αποθηκεÏτηκε."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2115,138 +2431,155 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "ΑποχώÏηση"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Ρυθμίσεις OpenID"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Ρυθμίσεις OpenID"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Ρυθμίσεις OpenID"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Ρυθμίσεις OpenID"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "ΑποχώÏηση"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr ""
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "ΑποχώÏηση"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr ""
@@ -2304,7 +2637,7 @@ msgid "Full name"
msgstr "Ονοματεπώνυμο"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ΑÏχική σελίδα"
@@ -2328,7 +2661,7 @@ msgstr "ΒιογÏαφικό"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Τοποθεσία"
@@ -2352,7 +2685,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr ""
@@ -2381,7 +2714,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογÏαφικό είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 140 χαÏακτ.)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2394,25 +2727,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Απέτυχε η ενημέÏωση του χÏήστη για την αυτόματη συνδÏομή."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -2434,37 +2767,37 @@ msgstr ""
msgid "Public timeline"
msgstr ""
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Δημόσια Ïοή %s"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2473,7 +2806,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2506,7 +2839,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2644,7 +2977,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2684,7 +3017,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2789,7 +3122,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -2828,7 +3161,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "ΔημιουÏγία"
@@ -2844,6 +3177,11 @@ msgstr "ΔημιουÏγία"
msgid "Replies to %s"
msgstr ""
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr ""
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2885,6 +3223,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Η κατάσταση διαγÏάφεται."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2893,6 +3236,123 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Ψευδώνυμο"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "ΠÏοσκλήσεις"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "ΠεÏιγÏαφή"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr ""
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Είσαι σίγουÏος ότι θες να διαγÏάψεις αυτό το μήνυμα;"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s και οι φίλοι του/της"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2942,18 +3402,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr ""
@@ -2999,10 +3464,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr ""
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "ΔημιουÏγημένος"
@@ -3058,6 +3519,11 @@ msgstr "Ρυθμίσεις OpenID"
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s και οι φίλοι του/της"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3083,25 +3549,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3110,7 +3576,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3118,7 +3584,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr ""
@@ -3135,199 +3601,145 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Η διεÏθυνση του εισεÏχόμενου email αφαιÏέθηκε."
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Τοπικός"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "ΑποχώÏηση"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "ΠÏόσβαση"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr ""
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr ""
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Ρυθμίσεις OpenID"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3430,16 +3842,26 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3499,7 +3921,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3509,19 +3931,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr ""
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3550,7 +3977,8 @@ msgstr ""
msgid "User profile"
msgstr "ΠÏοφίλ χÏήστη"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3607,7 +4035,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr ""
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3622,88 +4050,68 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Îέοι χÏήστες"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Όλες οι συνδÏομές"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Αυτόματα γίνε συνδÏομητής σε όσους γίνονται συνδÏομητές σε μένα (χÏήση "
"κυÏίως από λογισμικό και όχι ανθÏώπους)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "ΠÏοσκλήσεις"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Εξουσιοδοτημένη συνδÏομή"
@@ -3715,85 +4123,85 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Αποδοχή"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Γίνε συνδÏομητής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr ""
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr ""
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr ""
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3812,6 +4220,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3838,11 +4251,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Η κατάσταση διαγÏάφεται."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3874,12 +4282,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Ψευδώνυμο"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "ΠÏοσωπικά"
@@ -3888,10 +4291,6 @@ msgstr "ΠÏοσωπικά"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ΠεÏιγÏαφή"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3941,58 +4340,83 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Απέτυχε η συνδÏομή."
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Απέτυχε η διαγÏαφή συνδÏομής."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Απέτυχε η διαγÏαφή συνδÏομής."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Δεν ήταν δυνατή η δημιουÏγία ομάδας."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
@@ -4034,129 +4458,125 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "ΑÏχή"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-msgid "Account"
-msgstr "ΛογαÏιασμός"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "ΣÏνδεση"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Αδυναμία ανακατεÏθηνσης στο διακομιστή: %s"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "ΠÏοσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "ΑποσÏνδεση"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
-msgstr "ΔημιουÏγία έναν λογαÏιασμοÏ"
+msgstr "ΔημιουÏγία ενός λογαÏιασμοÏ"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Βοήθεια"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Βοηθήστε με!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "ΠεÏί"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Συχνές εÏωτήσεις"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr ""
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4165,13 +4585,13 @@ msgstr ""
"To **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου) που "
"έφεÏε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, fuzzy, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
"Το **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου). "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4179,32 +4599,54 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr ""
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4237,11 +4679,101 @@ msgstr "Επιβεβαίωση διεÏθυνσης email"
msgid "Design configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Επιβεβαίωση διεÏθυνσης email"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Επιβεβαίωση διεÏθυνσης email"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Επιβεβαίωση διεÏθυνσης email"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα μέχÏι %d χαÏακτήÏες"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr ""
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4262,12 +4794,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Ο κωδικός αποθηκεÏτηκε."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Ο κωδικός αποθηκεÏτηκε."
@@ -4419,82 +4951,92 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Κανένας τέτοιος χÏήστης."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Απέτυχε η συνδÏομή."
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
msgstr[1] "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
msgstr[1] "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Δεν είστε μέλος καμίας ομάδας."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα πεÏισσότεÏα μέλη"
msgstr[1] "Ομάδες με τα πεÏισσότεÏα μέλη"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4508,6 +5050,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4535,20 +5078,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Ο κωδικός επιβεβαίωσης δεν βÏέθηκε."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4564,6 +5107,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "ΣÏνδεση"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4649,7 +5201,7 @@ msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα μέχÏι %d χαÏακτήÏες"
+msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα χÏησιμοποιώντας μέχÏι %d χαÏακτήÏες"
#: lib/groupeditform.php:179
msgid ""
@@ -4748,12 +5300,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -4950,7 +5502,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "από"
@@ -5068,57 +5620,53 @@ msgid "Do not share my location"
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Επαναλαμβάνεται από"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Ρυθμίσεις OpenID"
@@ -5152,11 +5700,7 @@ msgstr ""
msgid "Duplicate notice"
msgstr "ΔιαγÏαφή μηνÏματος"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Απέτυχε η εισαγωγή νέας συνδÏομής."
@@ -5172,19 +5716,19 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5263,6 +5807,10 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος
msgid "Repeat this notice"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5332,36 +5880,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Απέτυχε η συνδÏομή."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Απέτυχε η συνδÏομή."
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Απέτυχε η διαγÏαφή συνδÏομής."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Απέτυχε η διαγÏαφή συνδÏομής."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5414,81 +5932,81 @@ msgstr ""
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "ΕπεξεÏγασία Ïυθμίσεων Ï€Ïοφίλ"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "ΕπεξεÏγασία"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Μήνυμα"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr ""
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr "%s δεν είναι ένα έγκυÏο χÏώμα!"
+msgstr "Το %s δεν είναι ένα έγκυÏο χÏώμα!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 407007fbf..98e7790f2 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,17 +10,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:04+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:27+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Access"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Site access settings"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registration"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Private"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Prohibit anonymous users (not logged in) from viewing site?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Invite only"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Make registration invitation only."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Closed"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Disable new registrations."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Save"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Save access settings"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +87,29 @@ msgstr "No such page"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "No such user."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s and friends, page %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -91,15 +147,15 @@ msgstr ""
"something yourself."
#: actions/all.php:134
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"You can try to [nudge %s](../%s) from his profile or [post something to his "
-"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
+"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -112,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "You and friends"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates from %1$s and friends on %2$s!"
@@ -123,23 +179,23 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API method not found."
@@ -153,7 +209,7 @@ msgstr "API method not found."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "This method requires a POST."
@@ -186,8 +242,9 @@ msgstr "Couldn't save profile."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -267,18 +324,16 @@ msgid "No status found with that ID."
msgstr "No status found with that ID."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "This status is already a favourite!"
+msgstr "This status is already a favourite."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "Could not create favourite."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "That status is not a favourite!"
+msgstr "That status is not a favourite."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -298,19 +353,18 @@ msgid "Could not unfollow user: User not found."
msgstr "Could not unfollow user: User not found."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "You cannot unfollow yourself!"
+msgstr "You cannot unfollow yourself."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "Two user ids or screen_names must be supplied."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Could not determine source user."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Could not find target user."
@@ -332,7 +386,8 @@ msgstr "Nickname already in use. Try another one."
msgid "Not a valid nickname."
msgstr "Not a valid nickname."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -344,7 +399,8 @@ msgstr "Homepage is not a valid URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Full name is too long (max 255 chars)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Description is too long (max %d chars)"
@@ -380,7 +436,7 @@ msgstr "Alias can't be the same as nickname."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Group not found!"
@@ -393,18 +449,18 @@ msgid "You have been blocked from that group by the admin."
msgstr "You have been blocked from that group by the admin."
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Could not join user %s to group %s."
+msgstr "Could not join user %1$s to group %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr "You are not a member of this group."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Could not remove user %s to group %s."
+msgstr "Could not remove user %1$s to group %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -421,6 +477,115 @@ msgstr "%s groups"
msgid "groups on %s"
msgstr "groups on %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "No oauth_token parameter provided."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Invalid token."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "There was a problem with your session token. Try again, please."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Invalid nickname / password!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Database error deleting OAuth application user."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Database error inserting OAuth application user."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"The request token %s has been authorised. Please exchange it for an access "
+"token."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "The request token %s has been denied and revoked."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Unexpected form submission."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "An application would like to connect to your account"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Allow or deny access"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Account"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nickname"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Password"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Deny"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Allow"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Allow or deny access to your account information."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "This method requires a POST or DELETE."
@@ -450,17 +615,17 @@ msgstr "Status deleted."
msgid "No status with that ID found."
msgstr "No status with that ID found."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "That's too long. Max notice size is %d chars."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Not found"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Max notice size is %d chars, including attachment URL."
@@ -470,14 +635,14 @@ msgid "Unsupported format."
msgstr "Unsupported format."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favourites from %s"
+msgstr "%1$s / Favourites from %2$s"
-#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:117
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s updates favourited by %s / %s."
+msgstr "%1$s updates favourited by %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -485,7 +650,7 @@ msgstr "%s updates favourited by %s / %s."
msgid "%s timeline"
msgstr "%s timeline"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -501,27 +666,22 @@ msgstr "%1$s / Updates mentioning %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates that reply to updates from %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s public timeline"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates from everyone!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Repeated by %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Repeated to %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repeats of %s"
@@ -531,7 +691,7 @@ msgstr "Repeats of %s"
msgid "Notices tagged with %s"
msgstr "Notices tagged with %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates tagged with %1$s on %2$s!"
@@ -591,8 +751,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Preview"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Delete"
@@ -604,29 +764,6 @@ msgstr "Upload"
msgid "Crop"
msgstr "Crop"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "There was a problem with your session token. Try again, please."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Unexpected form submission."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Pick a square area of the image to be your avatar"
@@ -665,8 +802,9 @@ msgstr ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
@@ -674,13 +812,13 @@ msgstr "No"
msgid "Do not block this user"
msgstr "Do not block this user"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
@@ -704,9 +842,9 @@ msgid "%s blocked profiles"
msgstr "%s blocked profiles"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s blocked profiles, page %d"
+msgstr "%1$s blocked profiles, page %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -763,8 +901,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Couldn't delete e-mail confirmation."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirm Address"
+msgid "Confirm address"
+msgstr "Confirm address"
#: actions/confirmaddress.php:159
#, php-format
@@ -780,10 +918,51 @@ msgstr "Conversation"
msgid "Notices"
msgstr "Notices"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "You must be logged in to delete an application."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Application not found."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "You are not the owner of this application."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "There was a problem with your session token."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Delete application"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Do not delete this application"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Delete this application"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -814,7 +993,7 @@ msgstr "Are you sure you want to delete this notice?"
msgid "Do not delete this notice"
msgstr "Do not delete this notice"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -869,18 +1048,16 @@ msgid "Site logo"
msgstr "Site logo"
#: actions/designadminpanel.php:387
-#, fuzzy
msgid "Change theme"
-msgstr "Change"
+msgstr "Change theme"
#: actions/designadminpanel.php:404
msgid "Site theme"
msgstr "Site theme"
#: actions/designadminpanel.php:405
-#, fuzzy
msgid "Theme for the site."
-msgstr "Logout from the site"
+msgstr "Theme for the site."
#: actions/designadminpanel.php:417 lib/designsettings.php:101
msgid "Change background image"
@@ -892,11 +1069,13 @@ msgid "Background"
msgstr "Background"
#: actions/designadminpanel.php:427
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "You can upload a logo image for your group."
+msgstr ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
#: actions/designadminpanel.php:457 lib/designsettings.php:139
msgid "On"
@@ -919,14 +1098,12 @@ msgid "Change colours"
msgstr "Change colours"
#: actions/designadminpanel.php:510 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "Connect"
+msgstr "Content"
#: actions/designadminpanel.php:523 lib/designsettings.php:204
-#, fuzzy
msgid "Sidebar"
-msgstr "Search"
+msgstr "Sidebar"
#: actions/designadminpanel.php:536 lib/designsettings.php:217
msgid "Text"
@@ -948,16 +1125,6 @@ msgstr "Restore default designs"
msgid "Reset back to default"
msgstr "Reset back to default"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Save"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Save design"
@@ -970,9 +1137,75 @@ msgstr "This notice is not a favourite!"
msgid "Add to favorites"
msgstr "Add to favourites"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "No such document."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "No such document \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Edit Application"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "You must be logged in to edit an application."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "No such application."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Use this form to edit your application."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Name is required."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Name is too long (max 255 chars)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Name already in use. Try another one."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Description is required."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "Source URL is too long."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Source URL is not valid."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organisation is required."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organisation is too long (max 255 chars)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Organisation homepage is required."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Callback is too long."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "Callback URL is not valid."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Could not update application."
#: actions/editgroup.php:56
#, php-format
@@ -985,9 +1218,8 @@ msgstr "You must be logged in to create a group."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "You must be an admin to edit the group"
+msgstr "You must be an admin to edit the group."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -1002,7 +1234,7 @@ msgstr "description is too long (max %d chars)."
msgid "Could not update group."
msgstr "Could not update group."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Could not create aliases"
@@ -1011,9 +1243,8 @@ msgid "Options saved."
msgstr "Options saved."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
-msgstr "E-mail Settings"
+msgstr "E-mail settings"
#: actions/emailsettings.php:71
#, php-format
@@ -1044,14 +1275,14 @@ msgstr ""
"a message with further instructions."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancel"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "E-mail addresses"
+msgstr "E-mail address"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1125,7 +1356,7 @@ msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
@@ -1137,7 +1368,7 @@ msgstr "That is already your e-mail address."
msgid "That email address already belongs to another user."
msgstr "That e-mail address already belongs to another user."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Couldn't insert confirmation code."
@@ -1198,7 +1429,7 @@ msgstr "This notice is already a favourite!"
msgid "Disfavor favorite"
msgstr "Disfavor favourite"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Popular notices"
@@ -1256,29 +1487,25 @@ msgid "Featured users, page %d"
msgstr "Featured users, page %d"
#: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
msgid "A selection of some great users on %s"
-msgstr "A selection of some of the great users on %s"
+msgstr "A selection of some great users on %s"
#: actions/file.php:34
-#, fuzzy
msgid "No notice ID."
-msgstr "No notice."
+msgstr "No notice ID."
#: actions/file.php:38
-#, fuzzy
msgid "No notice."
msgstr "No notice."
#: actions/file.php:42
-#, fuzzy
msgid "No attachments."
-msgstr "No such document."
+msgstr "No attachments."
#: actions/file.php:51
-#, fuzzy
msgid "No uploaded attachments."
-msgstr "No such document."
+msgstr "No uploaded attachments."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
@@ -1353,21 +1580,21 @@ msgstr "User is already blocked from group."
msgid "User is not a member of group."
msgstr "User is not a member of group."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Block user"
#: actions/groupblock.php:162
-#, fuzzy, php-format
+#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
-"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
-"be removed from the group, unable to post, and unable to subscribe to the "
-"group in the future."
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post and unable to subscribe to "
+"the group in the future."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1457,25 +1684,25 @@ 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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Block"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
#, fuzzy
msgid "Make user an admin of the group"
msgstr "You must be an admin to edit the group"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
#, fuzzy
msgid "Make Admin"
msgstr "Admin"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1503,6 +1730,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1585,9 +1817,8 @@ msgstr ""
"message with further instructions. (Did you add %s to your buddy list?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
-msgstr "I.M. Address"
+msgstr "IM address"
#: actions/imsettings.php:126
#, php-format
@@ -1648,6 +1879,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "That is not your Jabber ID."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Inbox for %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1728,7 +1964,7 @@ msgstr "Personal message"
msgid "Optionally add a personal message to the invitation."
msgstr "Optionally add a personal message to the invitation."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Send"
@@ -1825,11 +2061,10 @@ msgid "Incorrect username or password."
msgstr "Incorrect username or password."
#: actions/login.php:132 actions/otp.php:120
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "You are not authorised."
+msgstr "Error setting user. You are probably not authorised."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
@@ -1838,17 +2073,6 @@ msgstr "Login"
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Nickname"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Password"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Remember me"
@@ -1878,21 +2102,21 @@ msgstr ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "User is already blocked from group."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Could not remove user %s to group %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "You must be an admin to edit the group"
@@ -1901,6 +2125,30 @@ msgstr "You must be an admin to edit the group"
msgid "No current status"
msgstr "No current status"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "No such notice."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "You must be logged in to create a group."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Use this form to create a new group."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Could not create aliases"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "New group"
@@ -1984,6 +2232,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2009,6 +2259,51 @@ msgstr "Nudge sent"
msgid "Nudge sent!"
msgstr "Nudge sent!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "You must be logged in to create a group."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Other options"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "You are not a member of that group."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "You have not authorised any applications to use your account."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Notice has no profile"
@@ -2027,8 +2322,8 @@ msgstr "Connect"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2041,7 +2336,8 @@ msgid "Notice Search"
msgstr "Notice Search"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Other Settings"
#: actions/othersettings.php:71
@@ -2054,7 +2350,7 @@ msgstr ""
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Shorten URLs with"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2098,6 +2394,11 @@ msgstr "Invalid notice content"
msgid "Login token expired."
msgstr "Login to site"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Outbox for %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2168,7 +2469,7 @@ msgstr "Can't save new password."
msgid "Password saved."
msgstr "Password saved."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2176,138 +2477,154 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Theme directory not readable: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Invite"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Server"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Site path"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Avatar settings"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Avatar updated."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Avatar updated."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Never"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Sometimes"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Server"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Save paths"
@@ -2339,9 +2656,9 @@ msgid "Invalid notice content"
msgstr "Invalid notice content"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr "Notice licence ‘%s’ is not compatible with site licence ‘%s’."
+msgstr "Notice licence ‘1%$s’ is not compatible with site licence ‘%2$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2368,7 +2685,7 @@ msgid "Full name"
msgstr "Full name"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
@@ -2391,7 +2708,7 @@ msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Location"
@@ -2416,7 +2733,7 @@ msgid ""
msgstr ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Language"
@@ -2443,7 +2760,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max %d chars)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Timezone not selected."
@@ -2456,24 +2773,24 @@ msgstr "Language is too long (max 50 chars)."
msgid "Invalid tag: \"%s\""
msgstr "Invalid tag: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Couldn't update user for autosubscribe."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Couldn't save tags."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Couldn't save profile."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Couldn't save tags."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Settings saved."
@@ -2495,39 +2812,39 @@ msgstr "Public timeline, page %d"
msgid "Public timeline"
msgstr "Public timeline"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Public Stream Feed"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Public Stream Feed"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Public Stream Feed"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2540,7 +2857,7 @@ msgstr ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2576,7 +2893,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Tag cloud"
@@ -2613,6 +2930,8 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the e-mail address you have stored in your account."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
@@ -2624,7 +2943,7 @@ msgstr ""
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Nickname or e-mail address"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -2715,7 +3034,7 @@ msgstr "Error with confirmation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -2755,7 +3074,7 @@ msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2785,7 +3104,7 @@ msgstr ""
"number."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2802,18 +3121,18 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
"\n"
-"* Go to [your profile](%s) and post your first message.\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
"notices through instant messages.\n"
"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
+"share your interests.  \n"
"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
+"others more about you.  \n"
"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
+"missed.  \n"
"\n"
"Thanks for signing up and we hope you enjoy using this service."
@@ -2862,7 +3181,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL of your profile on another compatible microblogging service"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscribe"
@@ -2904,7 +3223,7 @@ msgstr "You can't repeat your own notice."
msgid "You already repeated that notice."
msgstr "You have already blocked this user."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Created"
@@ -2920,6 +3239,11 @@ msgstr "Created"
msgid "Replies to %s"
msgstr "Replies to %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Replies to %1$s on %2$s!"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2964,6 +3288,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Replies to %1$s on %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Status deleted."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "You cannot sandbox users on this site."
@@ -2972,6 +3301,125 @@ msgstr "You cannot sandbox users on this site."
msgid "User is already sandboxed."
msgstr "User is already sandboxed."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Design settings for this StausNet site."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Save site settings"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "You must be logged in to leave a group."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Notice has no profile"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Nickname"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Pagination"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Description"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistics"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Authorise URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Are you sure you want to delete this notice?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s's favourite notices"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Could not retrieve favourite notices."
@@ -2996,6 +3444,8 @@ msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"You haven't chosen any favourite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
#: actions/showfavorites.php:207
#, php-format
@@ -3003,6 +3453,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s hasn't added any notices to his favourites yet. Post something "
+"interesting they would add to their favourites :)"
#: actions/showfavorites.php:211
#, php-format
@@ -3011,6 +3463,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s hasn't added any notices to his favourites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favourites :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
@@ -3021,17 +3476,22 @@ msgstr ""
msgid "%s group"
msgstr "%s group"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%s group members, page %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Group profile"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Note"
@@ -3077,10 +3537,6 @@ msgstr "(None)"
msgid "All members"
msgstr "All members"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistics"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Created"
@@ -3094,6 +3550,11 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
#: actions/showgroup.php:454
#, fuzzy, php-format
@@ -3138,6 +3599,11 @@ msgstr "Notice deleted."
msgid " tagged %s"
msgstr " tagged %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s and friends, page %2$d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3163,19 +3629,19 @@ msgstr "Notice feed for %s"
msgid "FOAF for %s"
msgstr "FOAF for %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"This is the timeline for %s and friends but no one has posted anything yet."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, fuzzy, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3184,7 +3650,7 @@ msgstr ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3193,7 +3659,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3204,7 +3670,7 @@ msgstr ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Replies to %s"
@@ -3223,198 +3689,145 @@ msgstr "User is already blocked from group."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Not a valid e-mail address."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "Minimum text limit is 140 characters."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Site name"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
-#, fuzzy
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
-msgstr "New e-mail address for posting to %s"
+msgstr "Contact e-mail address for your site"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Local views"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Default site language"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URLs"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Server"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Access"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Private"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Invite only"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Closed"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Save site settings"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3525,15 +3938,26 @@ msgstr "No code entered"
msgid "You are not subscribed to that profile."
msgstr "You are not subscribed to that profile."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Could not save subscription."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "No such notice."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "You are not subscribed to that profile."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscribed"
@@ -3593,7 +4017,7 @@ msgstr "These are the people whose notices you listen to."
msgid "These are the people whose notices %s listens to."
msgstr "These are the people whose notices %s listens to."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3603,19 +4027,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s is not listening to anyone."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Users self-tagged with %s - page %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3645,7 +4074,8 @@ msgstr "Tag %s"
msgid "User profile"
msgstr "User profile"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Photo"
@@ -3706,7 +4136,7 @@ msgstr "No profile id in request."
msgid "Unsubscribed"
msgstr "Unsubscribed"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, fuzzy, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3721,88 +4151,68 @@ msgstr "User"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profile"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "New users"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Default subscription"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Invitation(s) sent"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "Invitation(s) sent"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Authorise subscription"
@@ -3818,36 +4228,36 @@ msgstr ""
"user's notices. If you didn't just ask to subscribe to someone's notices, "
"click \"Cancel\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "License"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Accept"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Subscribe to this user"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Reject"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Reject this subscription"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "No authorisation request!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Subscription authorised"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3858,11 +4268,11 @@ msgstr ""
"with the site's instructions for details on how to authorise the "
"subscription. Your subscription token is:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Subscription rejected"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3873,37 +4283,37 @@ msgstr ""
"with the site's instructions for details on how to fully reject the "
"subscription."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Can't read avatar URL '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Wrong image type for '%s'"
@@ -3923,6 +4333,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%s group members, page %d"
+
#: actions/usergroups.php:130
#, fuzzy
msgid "Search for more groups"
@@ -3950,11 +4365,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Status deleted."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3966,6 +4376,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU Affero General Public Licence as published by the Free "
+"Software Foundation, either version 3 of the Licence, or (at your option) "
+"any later version. "
#: actions/version.php:174
msgid ""
@@ -3974,6 +4388,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public Licence "
+"for more details. "
#: actions/version.php:180
#, php-format
@@ -3981,17 +4399,14 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"You should have received a copy of the GNU Affero General Public Licence "
+"along with this program. If not, see %s."
#: actions/version.php:189
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Nickname"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Personal"
@@ -4000,10 +4415,6 @@ msgstr "Personal"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Description"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4054,27 +4465,27 @@ msgstr "Could not insert message."
msgid "Could not update message with new URI."
msgstr "Could not update message with new URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "DB error inserting hashtag: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problem saving notice."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem saving notice. Unknown user."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4082,34 +4493,60 @@ msgid ""
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "DB error inserting reply: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Problem saving notice."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "You have been banned from subscribing."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "User has blocked you."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Not subscribed!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Couldn't delete subscription."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Couldn't delete subscription."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welcome to %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Could not create group."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Could not set group membership."
@@ -4150,130 +4587,126 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Untitled page"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Primary site navigation"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Home"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Account"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Change your e-mail, avatar, password, profile"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Connect"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Could not redirect to server: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Primary site navigation"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invite"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Logout"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Logout from the site"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Create an account"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Help"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Search"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Site notice"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Local views"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Page notice"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "About"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "F.A.Q."
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Source"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet software licence"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4282,12 +4715,12 @@ msgstr ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is a microblogging service."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4298,33 +4731,55 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Site content license"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "All "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licence."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "After"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Before"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4360,11 +4815,104 @@ msgstr "E-mail address confirmation"
msgid "Design configuration"
msgstr "Design configuration"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS confirmation"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Design configuration"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS confirmation"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Design configuration"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Describe the group or topic in %d characters"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Describe the group or topic"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Source"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL of the homepage or blog of the group or topic"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organisation responsible for this application"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL for the homepage of the organisation"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Remove"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4386,12 +4934,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Password change"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Password change"
@@ -4542,83 +5090,92 @@ msgstr "Error saving notice."
msgid "Specify the name of the user to subscribe to"
msgstr "Specify the name of the user to subscribe to"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "No such user."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribed to %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specify the name of the user to unsubscribe from"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Unsubscribed from %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Command not yet implemented."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notification off."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Can't turn off notification."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notification on."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Can't turn on notification."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Unsubscribed from %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are already subscribed to these users:"
msgstr[1] "You are already subscribed to these users:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "You are not a member of that group."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are not a member of that group."
msgstr[1] "You are not a member of that group."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4632,6 +5189,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4659,19 +5217,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "No configuration file found"
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Go to the installer."
@@ -4687,6 +5245,15 @@ msgstr "Updates by instant messenger (I.M.)"
msgid "Updates by SMS"
msgstr "Updates by SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Connect"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4872,12 +5439,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5092,7 +5659,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "from"
@@ -5211,59 +5778,55 @@ msgid "Do not share my location"
msgstr "Couldn't save tags."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Created"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Reply to this notice"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Reply"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Notice deleted."
@@ -5296,11 +5859,7 @@ msgstr "Error inserting remote profile."
msgid "Duplicate notice"
msgstr "Duplicate notice"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "You have been banned from subscribing."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Couldn't insert new subscription."
@@ -5316,19 +5875,19 @@ msgstr "Replies"
msgid "Favorites"
msgstr "Favourites"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Inbox"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Your incoming messages"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Outbox"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Your sent messages"
@@ -5409,6 +5968,10 @@ msgstr "Reply to this notice"
msgid "Repeat this notice"
msgstr "Reply to this notice"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Sandbox"
@@ -5477,36 +6040,6 @@ msgstr "People subscribed to %s"
msgid "Groups %s is a member of"
msgstr "Groups %s is a member of"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "User has blocked you."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Could not subscribe."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Could not subscribe other to you."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Not subscribed!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Couldn't delete subscription."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Couldn't delete subscription."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5557,67 +6090,67 @@ msgstr "Edit Avatar"
msgid "User actions"
msgstr "User actions"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Edit profile settings"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Send a direct message to this user"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "about a year ago"
@@ -5631,7 +6164,7 @@ msgstr "%s is not a valid colour!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Message too long - maximum is %d characters, you sent %d"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 76343bf66..b5e0469b6 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -12,17 +12,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:07+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:30+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Acceder"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Configuración de acceso de la web"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registro"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privado"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "¿Prohibir a los usuarios anónimos (no conectados) ver el sitio?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Invitar sólo"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Haz que el registro sea sólo con invitaciones."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Cerrado"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Inhabilitar nuevos registros."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Guardar"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Guardar la configuración de acceso"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -37,25 +89,29 @@ msgstr "No existe tal página"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "No existe ese usuario."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s y amigos, página %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -81,6 +137,8 @@ msgstr "Feed de los amigos de %s (Atom)"
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
+"Esta es la línea temporal de %s y amistades, pero nadie ha publicado nada "
+"todavía."
#: actions/all.php:132
#, php-format
@@ -88,6 +146,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
+"Esta es la línea temporal de %s y amistades, pero nadie ha publicado nada "
+"todavía."
#: actions/all.php:134
#, php-format
@@ -95,20 +155,24 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+"Trata de suscribirte a más personas, [unirte a un grupo] (%%action.groups%%) "
+"o publicar algo."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"Puede intentar [guiñar a %1$s](../%2$s) desde su perfil o [publicar algo a "
+"su atención ](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/all.php:165
msgid "You and friends"
msgstr "Tú y amigos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
@@ -118,26 +182,25 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
-#, fuzzy
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
-msgstr "¡No se encontró el método de la API!"
+msgstr "Método de API no encontrado."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofile.php:89
@@ -149,7 +212,7 @@ msgstr "¡No se encontró el método de la API!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método requiere un POST."
@@ -158,9 +221,10 @@ msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
msgstr ""
+"Tienes que especificar un parámetro llamdao 'dispositivo' con un valor a "
+"elegir entre: sms, im, ninguno"
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "No se pudo actualizar el usuario."
@@ -174,14 +238,14 @@ msgid "User has no profile."
msgstr "El usuario no tiene un perfil."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "No se pudo guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -198,15 +262,13 @@ msgstr ""
#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
msgid "Unable to save your design settings."
-msgstr "¡No se pudo guardar tu configuración de Twitter!"
+msgstr "No se pudo grabar tu configuración de diseño."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
-msgstr "No se pudo actualizar el usuario."
+msgstr "No se pudo actualizar tu diseño."
#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
@@ -245,9 +307,9 @@ msgid "No message text!"
msgstr "¡Sin texto de mensaje!"
#: 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 "Demasiado largo. Máximo 140 caracteres. "
+msgstr "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
@@ -299,11 +361,11 @@ msgstr "No puedes dejar de seguirte a ti mismo."
msgid "Two user ids or screen_names must be supplied."
msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "No se pudo determinar el usuario fuente."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "No se pudo encontrar ningún usuario de destino."
@@ -312,22 +374,23 @@ msgstr "No se pudo encontrar ningún usuario de destino."
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-"El apodo debe tener solamente letras minúsculas y números y no puede tener "
+"El usuario debe tener solamente letras minúsculas y números y no puede tener "
"espacios."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
-msgstr "El apodo ya existe. Prueba otro."
+msgstr "El usuario ya existe. Prueba con otro."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
-msgstr "Apodo no válido"
+msgstr "Usuario inválido"
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -339,7 +402,8 @@ msgstr "La página de inicio no es un URL válido."
msgid "Full name is too long (max 255 chars)."
msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descripción es demasiado larga (máx. %d caracteres)."
@@ -358,27 +422,26 @@ msgstr "¡Muchos seudónimos! El máximo es %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Tag no válido: '%s' "
+msgstr "Alias inválido: \"%s\""
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "El apodo ya existe. Prueba otro."
+msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "El alias no puede ser el mismo que el usuario."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
-msgstr "¡No se encontró el método de la API!"
+msgstr "¡No se ha encontrado el grupo!"
#: actions/apigroupjoin.php:110 actions/joingroup.php:90
msgid "You are already a member of that group."
@@ -386,21 +449,21 @@ msgstr "Ya eres miembro de ese grupo"
#: 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 "Has sido bloqueado de ese grupo por el administrador."
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "No se puede unir usuario %s a grupo %s"
+msgstr "No se pudo unir el usuario %s al grupo %s"
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr "No eres miembro de este grupo."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "No se pudo eliminar a usuario %s de grupo %s"
+msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -417,6 +480,118 @@ msgstr "Grupos %s"
msgid "groups on %s"
msgstr "Grupos en %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "No se ha provisto de un parámetro oauth_token."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Token inválido."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "¡Apodo o contraseña inválidos!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+"Error de la base de datos durante la eliminación del usuario de la "
+"aplicación OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"El token de solicitud %s ha sido autorizado. Por favor, cámbialo por un "
+"token de acceso."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "El token de solicitud %2 ha sido denegado y revocado."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Una aplicación quisiera conectarse a tu cuenta"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Permitir o denegar el acceso"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"La aplicación <strong>%1$s</strong> por <strong>%2$s</strong> solicita "
+"permiso para <strong>%3$s</strong> la información de tu cuenta %4$s. Sólo "
+"debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Cuenta"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Apodo"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contraseña"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Denegar"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Permitir"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Permitir o denegar el acceso a la información de tu cuenta."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Este método requiere un PUBLICAR O ELIMINAR"
@@ -431,14 +606,12 @@ msgid "No such notice."
msgstr "No existe ese aviso."
#: actions/apistatusesretweet.php:83
-#, fuzzy
msgid "Cannot repeat your own notice."
-msgstr "No se puede activar notificación."
+msgstr "No puedes repetir tus propias notificaciones."
#: actions/apistatusesretweet.php:91
-#, fuzzy
msgid "Already repeated that notice."
-msgstr "Borrar este aviso"
+msgstr "Esta notificación ya se ha repetido."
#: actions/apistatusesshow.php:138
msgid "Status deleted."
@@ -448,34 +621,36 @@ msgstr "Status borrado."
msgid "No status with that ID found."
msgstr "No hay estado para ese ID"
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
+msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "No encontrado"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
+"El tamaño máximo de la notificación es %d caracteres, incluyendo el URL "
+"adjunto."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
msgstr "Formato no soportado."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favoritos desde %s"
+msgstr "%1$s / Favoritos de %2$s"
-#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:117
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s actualizaciones favoritas por %s / %s."
+msgstr "%1$s actualizaciones favoritas de %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -483,66 +658,59 @@ msgstr "%s actualizaciones favoritas por %s / %s."
msgid "%s timeline"
msgstr "línea temporal de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "¡Actualizaciones de %1$s en %2$s!"
#: actions/apitimelinementions.php:117
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Actualizaciones en respuesta a %2$s"
+msgstr "%1$s / Actualizaciones que mencionan %2$s"
#: actions/apitimelinementions.php:127
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "línea temporal pública de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "¡Actualizaciones de todos en %s!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
+#, php-format
msgid "Repeated to %s"
-msgstr "Respuestas a %s"
+msgstr "Repetido a %s"
-#: actions/apitimelineretweetsofme.php:112
-#, fuzzy, php-format
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
msgid "Repeats of %s"
-msgstr "Respuestas a %s"
+msgstr "Repeticiones de %s"
#: actions/apitimelinetag.php:102 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
msgstr "Avisos marcados con %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
-#, fuzzy, php-format
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "¡Actualizaciones de %1$s en %2$s!"
+msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
#: actions/apiusershow.php:96
-#, fuzzy
msgid "Not found."
-msgstr "No se encontró."
+msgstr "No encontrado."
#: actions/attachment.php:73
-#, fuzzy
msgid "No such attachment."
-msgstr "No existe ese documento."
+msgstr "No existe tal archivo adjunto."
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -566,9 +734,9 @@ msgid "Avatar"
msgstr "Avatar"
#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Puedes cargar tu avatar personal."
+msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
@@ -591,8 +759,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Vista previa"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Borrar"
@@ -604,30 +772,6 @@ msgstr "Cargar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Envío de formulario inesperado."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
@@ -645,14 +789,12 @@ msgid "Failed updating avatar."
msgstr "Error al actualizar avatar."
#: actions/avatarsettings.php:393
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Avatar actualizado"
+msgstr "Avatar borrado."
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
-msgstr "Ya has bloqueado este usuario."
+msgstr "Ya has bloqueado a este usuario."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
@@ -664,24 +806,27 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"¿Realmente deseas bloquear a este usuario? Una vez que lo hagas, se "
+"desuscribirá de tu cuenta, no podrá suscribirse a ella en el futuro y no se "
+"te notificará de ninguna de sus respuestas @."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
msgid "Do not block this user"
-msgstr "Desbloquear este usuario"
+msgstr "No bloquear a este usuario"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
@@ -700,19 +845,19 @@ msgid "No such group."
msgstr "No existe ese grupo."
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "Perfil de usuario"
+msgstr "%s perfiles bloqueados"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s y amigos, página %d"
+msgstr "%1$s perfiles bloqueados, página %2$d"
#: actions/blockedfromgroup.php:108
-#, fuzzy
msgid "A list of the users blocked from joining this group."
-msgstr "Lista de los usuarios en este grupo."
+msgstr ""
+"Una lista de los usuarios que han sido bloqueados para unirse a este grupo."
#: actions/blockedfromgroup.php:281
msgid "Unblock user from group"
@@ -765,7 +910,7 @@ msgid "Couldn't delete email confirmation."
msgstr "No se pudo eliminar la confirmación de correo electrónico."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Confirmar la dirección"
#: actions/confirmaddress.php:159
@@ -782,10 +927,51 @@ msgstr "Conversación"
msgid "Notices"
msgstr "Avisos"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Debes estar registrado para borrar una aplicación."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Aplicación no encontrada."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "No eres el propietario de esta aplicación."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Hubo problemas con tu clave de sesión."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Eliminar la aplicación"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"¿Estás seguro de que quieres eliminar esta aplicación? Esto borrará todos "
+"los datos acerca de la aplicación de la base de datos, incluyendo todas las "
+"conexiones de usuario existente."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "No eliminar esta aplicación"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Borrar esta aplicación"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -797,13 +983,12 @@ msgid "Can't delete this notice."
msgstr "No se puede eliminar este aviso."
#: actions/deletenotice.php:103
-#, fuzzy
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
-"Estás a punto de eliminar permanentemente un aviso. Si lo hace, no se podrá "
-"deshacer"
+"Estás a punto de eliminar un mensaje permanentemente. Una vez hecho esto, no "
+"lo puedes deshacer."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
@@ -814,11 +999,10 @@ msgid "Are you sure you want to delete this notice?"
msgstr "¿Estás seguro de que quieres eliminar este aviso?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "No se puede eliminar este aviso."
+msgstr "No eliminar este mensaje"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -827,9 +1011,8 @@ msgid "You cannot delete users."
msgstr "No puedes borrar usuarios."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "No puedes borrar el estado de otro usuario."
+msgstr "Sólo puedes eliminar usuarios locales."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
@@ -840,6 +1023,8 @@ msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
+"¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos "
+"todos los datos sobre el usuario, sin dejar una copia de seguridad."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
msgid "Delete this user"
@@ -848,16 +1033,15 @@ msgstr "Borrar este usuario"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:316 lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Diseño"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Configuración de diseño de este sitio StatusNet."
#: actions/designadminpanel.php:275
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "Tamaño inválido."
+msgstr "URL de logotipo inválido."
#: actions/designadminpanel.php:279
#, php-format
@@ -869,56 +1053,54 @@ msgid "Change logo"
msgstr "Cambiar logo"
#: actions/designadminpanel.php:380
-#, fuzzy
msgid "Site logo"
-msgstr "Invitar"
+msgstr "Logo del sitio"
#: actions/designadminpanel.php:387
-#, fuzzy
msgid "Change theme"
-msgstr "Cambiar"
+msgstr "Cambiar el tema"
#: actions/designadminpanel.php:404
-#, fuzzy
msgid "Site theme"
-msgstr "Aviso de sitio"
+msgstr "Tema del sitio"
#: actions/designadminpanel.php:405
-#, fuzzy
msgid "Theme for the site."
-msgstr "Salir de sitio"
+msgstr "Tema para el sitio."
#: actions/designadminpanel.php:417 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Cambiar la imagen de fondo"
#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Fondo"
#: actions/designadminpanel.php:427
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "Puedes cargar una imagen de logo para tu grupo."
+msgstr ""
+"Puedes subir una imagen de fondo para el sitio. El tamaño máximo de archivo "
+"es %1$s."
#: actions/designadminpanel.php:457 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Activado"
#: actions/designadminpanel.php:473 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Desactivado"
#: actions/designadminpanel.php:474 lib/designsettings.php:156
msgid "Turn background image on or off."
-msgstr ""
+msgstr "Activar o desactivar la imagen de fondo."
#: actions/designadminpanel.php:479 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Imagen de fondo en mosaico"
#: actions/designadminpanel.php:488 lib/designsettings.php:170
msgid "Change colours"
@@ -929,9 +1111,8 @@ msgid "Content"
msgstr "Contenido"
#: actions/designadminpanel.php:523 lib/designsettings.php:204
-#, fuzzy
msgid "Sidebar"
-msgstr "Buscar"
+msgstr "Barra lateral"
#: actions/designadminpanel.php:536 lib/designsettings.php:217
msgid "Text"
@@ -943,29 +1124,19 @@ msgstr "Vínculos"
#: actions/designadminpanel.php:577 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Utilizar los valores predeterminados"
#: actions/designadminpanel.php:578 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Restaurar los diseños predeterminados"
#: actions/designadminpanel.php:584 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
-
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Guardar"
+msgstr "Volver a los valores predeterminados"
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Guardar el diseño"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -975,9 +1146,75 @@ msgstr "¡Este aviso no es un favorito!"
msgid "Add to favorites"
msgstr "Agregar a favoritos"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "No existe ese documento."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "No existe tal documento \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Editar aplicación"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Debes haber iniciado sesión para editar una aplicación."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "No existe tal aplicación."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Utiliza este formulario para editar tu aplicación."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Se requiere un nombre"
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "El nombre es muy largo (máx. 255 carac.)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Ese nombre ya está en uso. Prueba con otro."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Se requiere una descripción"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "El URL fuente es muy largo."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "La URL fuente es inválida."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Se requiere una organización."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "El texto de organización es muy largo (máx. 255 caracteres)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Se requiere una página principal de organización"
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "La devolución de llamada es muy larga."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "El URL de devolución de llamada es inválido."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "No fue posible actualizar la aplicación."
#: actions/editgroup.php:56
#, php-format
@@ -990,36 +1227,33 @@ msgstr "Debes estar conectado para crear un grupo"
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "Debes ser un admin para editar el grupo"
+msgstr "Para editar el grupo debes ser administrador."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
msgstr "Usa este formulario para editar el grupo."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
+msgstr "La descripción es muy larga (máx. %d caracteres)."
#: actions/editgroup.php:253
msgid "Could not update group."
msgstr "No se pudo actualizar el grupo."
-#: actions/editgroup.php:259 classes/User_group.php:390
-#, fuzzy
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
-msgstr "No se pudo crear favorito."
+msgstr "No fue posible crear alias."
#: actions/editgroup.php:269
msgid "Options saved."
msgstr "Se guardó Opciones."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
-msgstr "Opciones de Email"
+msgstr "Configuración del correo electrónico"
#: actions/emailsettings.php:71
#, php-format
@@ -1050,14 +1284,14 @@ msgstr ""
"la de spam!) por un mensaje con las instrucciones."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancelar"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "Direcciones de correo electrónico"
+msgstr "Dirección de correo electrónico"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1104,10 +1338,9 @@ msgstr ""
"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
+"Enviarme un correo electrónico cuando alguien me envíe una \"@-respuesta\"."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1135,7 +1368,7 @@ msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
@@ -1147,7 +1380,7 @@ msgstr "Esa ya es tu dirección de correo electrónico"
msgid "That email address already belongs to another user."
msgstr "Esa dirección de correo pertenece a otro usuario."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "No se pudo insertar el código de confirmación."
@@ -1209,31 +1442,33 @@ msgstr "¡Este aviso ya está en favoritos!"
msgid "Disfavor favorite"
msgstr "Sacar favorito"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
-#, fuzzy
msgid "Popular notices"
-msgstr "Avisos populares"
+msgstr "Mensajes populares"
#: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
msgid "Popular notices, page %d"
-msgstr "Avisos populares, página %d"
+msgstr "Mensajes populares, página %d"
#: actions/favorited.php:79
-#, fuzzy
msgid "The most popular notices on the site right now."
-msgstr "Ahora se muestran los avisos más populares en el sitio."
+msgstr "Los mensajes más populares del sitio en este momento."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
+"Los mensajes favoritos aparecen en esta página, pero todavía nadie ha "
+"marcado algún mensaje como favorito."
#: actions/favorited.php:153
msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr ""
+"Se la primera persona en añadir un mensaje a tus favoritos con el botón de "
+"favoritos que se encuentra al lado de cualquier mensaje que te guste."
#: actions/favorited.php:156
#, php-format
@@ -1241,6 +1476,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
+"¿Por qué no [registrar una cuenta](%%action.register%%) y ser la primera "
+"persona en añadir un mensaje a tus favoritos?"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1249,9 +1486,9 @@ msgid "%s's favorite notices"
msgstr "Avisos favoritos de %s"
#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "¡Actualizaciones de %1$s en %2$s!"
+msgstr "¡Actualizaciones favorecidas por %1$ s en %2$s!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
@@ -1264,14 +1501,13 @@ msgid "Featured users, page %d"
msgstr "Usuarios que figuran, página %d"
#: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
msgid "A selection of some great users on %s"
-msgstr "Una selección de algunos de los grandes usuarios en %s"
+msgstr "Una selección de fantásticos usuarios en %s"
#: actions/file.php:34
-#, fuzzy
msgid "No notice ID."
-msgstr "Nuevo aviso"
+msgstr "No hay ID de mensaje."
#: actions/file.php:38
msgid "No notice."
@@ -1306,14 +1542,12 @@ msgid "You are not authorized."
msgstr "No estás autorizado."
#: actions/finishremotesubscribe.php:113
-#, fuzzy
msgid "Could not convert request token to access token."
-msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
+msgstr "No se pudo convertir el token de solicitud en token de acceso."
#: actions/finishremotesubscribe.php:118
-#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Versión desconocida del protocolo OMB."
+msgstr "El servicio remoto utiliza una versión desconocida del protocolo OMB."
#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -1346,7 +1580,7 @@ msgstr "Grupo no especificado."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Sólo un administrador puede bloquear miembros de un grupo."
#: actions/groupblock.php:95
msgid "User is already blocked from group."
@@ -1356,7 +1590,7 @@ msgstr "Usuario ya está bloqueado del grupo."
msgid "User is not a member of group."
msgstr "Usuario no es miembro del grupo"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Bloquear usuario de grupo"
@@ -1367,6 +1601,9 @@ msgid ""
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
+"¿Realmente deseas bloquear al usuario \"%1$s\" del grupo \"%2$s\"? Se "
+"eliminará del grupo y no podrá publicar ni suscribirse al grupo en lo "
+"sucesivo."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1379,6 +1616,8 @@ msgstr "Bloquear este usuario de este grupo"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
msgstr ""
+"Se ha producido un error en la base de datos al bloquear el usuario del "
+"grupo."
#: actions/groupbyid.php:74 actions/userbyid.php:70
msgid "No ID."
@@ -1389,56 +1628,53 @@ msgid "You must be logged in to edit a group."
msgstr "Debes estar conectado para editar un grupo."
#: actions/groupdesignsettings.php:141
-#, fuzzy
msgid "Group design"
-msgstr "Grupos"
+msgstr "Diseño de grupo"
#: actions/groupdesignsettings.php:152
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personaliza el aspecto de tu grupo con una imagen de fondo y la paleta de "
+"colores que prefieras."
#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186
#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
msgid "Couldn't update your design."
-msgstr "No se pudo actualizar el usuario."
+msgstr "No fue posible actualizar tu diseño."
#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
-#, fuzzy
msgid "Design preferences saved."
-msgstr "Preferencias de sincronización guardadas."
+msgstr "Preferencias de diseño guardadas."
#: actions/grouplogo.php:139 actions/grouplogo.php:192
msgid "Group logo"
msgstr "Logo de grupo"
#: actions/grouplogo.php:150
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Puedes cargar una imagen de logo para tu grupo."
+msgstr ""
+"Puedes subir una imagen de logo para tu grupo. El tamaño máximo del archivo "
+"debe ser %s."
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "Usuario sin perfil equivalente"
+msgstr "Usuario sin perfil coincidente."
#: actions/grouplogo.php:362
-#, fuzzy
msgid "Pick a square area of the image to be the logo."
-msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
+msgstr "Elige un área cuadrada de la imagen para que sea tu logo."
#: actions/grouplogo.php:396
-#, fuzzy
msgid "Logo updated."
-msgstr "SE actualizó logo."
+msgstr "Logo actualizado."
#: actions/grouplogo.php:398
-#, fuzzy
msgid "Failed updating logo."
-msgstr "Error al actualizar logo."
+msgstr "Error al actualizar el logo."
#: actions/groupmembers.php:93 lib/groupnav.php:92
#, php-format
@@ -1446,40 +1682,38 @@ msgid "%s group members"
msgstr "Miembros del grupo %s"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "Miembros del grupo %s, página %d"
+msgstr "%1$s miembros de grupo, página %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "Lista de los usuarios en este grupo."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:441
-#, fuzzy
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
-msgstr "Debes ser un admin para editar el grupo"
+msgstr "Convertir al usuario en administrador del grupo"
-#: actions/groupmembers.php:473
-#, fuzzy
+#: actions/groupmembers.php:475
msgid "Make Admin"
-msgstr "Admin"
+msgstr "Convertir en administrador"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
-msgstr ""
+msgstr "Convertir a este usuario en administrador"
#: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Updates from members of %1$s on %2$s!"
-msgstr "¡Actualizaciones de %1$s en %2$s!"
+msgstr "¡Actualizaciones de miembros de %1$s en %2$s!"
#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1500,30 +1734,33 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Grupos %%%%site.name%%%% te permiten encontrar gente de intereses afines a "
+"los tuyo y hablar con ellos. Después de unirte al grupo, podrás enviarle "
+"mensajes a todos sus miembros mediante la sintaxis \"!groupname\". ¿No "
+"encuentras un grupo que te guste? ¡Intenta [buscar otro](%%%%action."
+"groupsearch%%%%) o [crea tú uno!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
msgstr "Crear un nuevo grupo"
#: actions/groupsearch.php:52
-#, fuzzy, php-format
+#, php-format
msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
-"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
+"Busca grupos en %%site.name%% por su nombre, ubicación o descripción. Separa "
+"los términos con espacios. Los términos tienen que ser de 3 o más caracteres."
#: actions/groupsearch.php:58
-#, fuzzy
msgid "Group search"
-msgstr "Buscador de grupos"
+msgstr "Búsqueda en grupos"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "Ningún resultado"
+msgstr "No se obtuvo resultados."
#: actions/groupsearch.php:82
#, php-format
@@ -1531,6 +1768,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Si no puedes encontrar el grupo que estás buscando, puedes [crearlo] (%%"
+"action.newgroup%%) tú mismo."
#: actions/groupsearch.php:85
#, php-format
@@ -1538,23 +1777,22 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"¿Por qué no [registras una cuenta](%%action.register%%) y [creas el grupo](%%"
+"action.newgroup%%) tú mismo?"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Sólo un administrador puede desbloquear miembros de grupos."
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "El usuario te ha bloqueado."
+msgstr "El usuario no está bloqueado del grupo."
#: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
msgid "Error removing the block."
-msgstr "Error al sacar bloqueo."
+msgstr "Se ha producido un error al eliminar el bloque."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "Configuración de mensajería instantánea"
@@ -1568,9 +1806,8 @@ msgstr ""
"Jabber/GTalk. Configura tu dirección y opciones abajo."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "Esta página no está disponible en un "
+msgstr "La mensajería instantánea no está disponible."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -1587,7 +1824,6 @@ msgstr ""
"de amigos?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "Dirección de mensajería instantánea"
@@ -1652,6 +1888,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Ese no es tu Jabber ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Bandeja de entrada de %1$s - página %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1664,7 +1905,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Se han inhabilitado las invitaciones."
#: actions/invite.php:41
#, php-format
@@ -1733,7 +1974,7 @@ msgstr "Mensaje Personal"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1743,7 +1984,7 @@ msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
#: actions/invite.php:228
-#, fuzzy, php-format
+#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
"\n"
@@ -1772,55 +2013,54 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
-"%1$s te ha invitado a unirte a ellos en %2$s (%3$s).\n"
+"%1$s te ha invitado a unirte a %2$s (%3$s).\n"
"\n"
-"%2$s es un servicio de microblogueo que te permite estar al tanto de la "
-"gente que conoces y que te interesa.\n"
+"%2$s es un servicio de microblogueo que te permite mantenerte al corriente "
+"de las personas que sigues y que te interesan.\n"
"\n"
-"Puedes compartir noticias sobre tí mismo, tus pensamientos, o tu vida en "
-"línea con gente que te conoce. También es bueno para conocer gente que "
-"comparta tus intereses.\n"
+"También puedes compartir noticias acerca de tí, tus pensamientos o tu vida "
+"en línea con la gente que sabe de tí. También es una excelente herramienta "
+"para conocer gente nueva que comparta tus intereses.\n"
"\n"
-"%1$s dijo:\n"
+"%1$s ha dicho:\n"
"\n"
"%4$s\n"
"\n"
-"Puedes ver el perfil de %1$s en %2$s aquí:\n"
+"Puedes ver el perfil de %1$s aquí en %2$s:\n"
"\n"
"%5$s\n"
"\n"
-"Si quieres inscribirte y probar el servicio, haz click en enlace debajo para "
+"Si quieres probar el sevicio, haz clic en el vínculo a continuación para "
"aceptar la invitación.\n"
"\n"
"%6$s\n"
"\n"
-"Si no deseas inscribirte puedes ignorar este mensaje. Gracias por tu "
-"paciencia y tiempo.\n"
+"Si por el contrario, no quieres, ignora este mensaje. Muchas gracias por tu "
+"paciencia y por tu tiempo.\n"
"\n"
-"Sinceramente, %2$s\n"
+"Saludos cordiales, %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
msgstr "Debes estar conectado para unirte a un grupo."
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s se unió a grupo %s"
+msgstr "%1$s se ha unido al grupo %2$"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
msgstr "Debes estar conectado para dejar un grupo."
#: actions/leavegroup.php:90 lib/command.php:265
-#, fuzzy
msgid "You are not a member of that group."
-msgstr "No eres miembro de ese grupo"
+msgstr "No eres miembro de este grupo."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s dejó grupo %s"
+msgstr "%1$s ha dejado el grupo %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1831,11 +2071,10 @@ msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
#: actions/login.php:132 actions/otp.php:120
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "No autorizado."
+msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -1844,17 +2083,6 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Apodo"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contraseña"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Recordarme"
@@ -1878,38 +2106,58 @@ msgstr ""
"contraseña antes de cambiar tu configuración."
#: actions/login.php:270
-#, fuzzy, php-format
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea]"
-"(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
-"openidlogin%%). "
+"Inicia sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea](%%"
+"action.register%%) una cuenta."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
+"Sólo los administradores pueden convertir a un usuario en administrador."
-#: actions/makeadmin.php:95
-#, fuzzy, php-format
+#: actions/makeadmin.php:96
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Usuario ya está bloqueado del grupo."
+msgstr "%1$s ya es un administrador del grupo \"%2$s\"."
-#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#: actions/makeadmin.php:133
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "No se pudo eliminar a usuario %s de grupo %s"
+msgstr "No se puede obtener el registro de membresía de %1$s en el grupo %2$s."
-#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#: actions/makeadmin.php:146
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Debes ser un admin para editar el grupo"
+msgstr "No es posible convertir a %1$s en administrador del grupo %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "No existe estado actual"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nueva aplicación"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Debes conectarte para registrar una aplicación."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Utiliza este formulario para registrar una nueva aplicación."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Se requiere la URL fuente."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "No se pudo crear la aplicación."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Grupo nuevo "
@@ -1941,14 +2189,13 @@ msgid ""
msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Mensaje"
+msgstr "Mensaje enviado"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "Se envió mensaje directo a %s"
+msgstr "Se ha enviado un mensaje directo a %s."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1959,9 +2206,8 @@ msgid "New notice"
msgstr "Nuevo aviso"
#: actions/newnotice.php:211
-#, fuzzy
msgid "Notice posted"
-msgstr "Aviso publicado"
+msgstr "Mensaje publicado"
#: actions/noticesearch.php:68
#, php-format
@@ -1977,9 +2223,9 @@ msgid "Text search"
msgstr "Búsqueda de texto"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Busca \"%s\" en la Corriente"
+msgstr "Resultados de la búsqueda de \"%1$s\" en %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -1987,6 +2233,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Sé la primera persona en [publicar algo en este tema](%%%%action.newnotice%%%"
+"%?status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -1994,16 +2242,20 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"¿Por qué no [registras una cuenta](%%%%action.register%%%%) y te conviertes "
+"en la primera persona en [publicar algo en este tema](%%%%action.newnotice%%%"
+"%?status_textarea=%s)?"
#: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
msgid "Updates with \"%s\""
-msgstr "¡Actualizaciones de %1$s en %2$s!"
+msgstr "Actualizaciones con \"%s\""
#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
+msgstr ""
+"¡Actualizaciones que contienen el término de búsqueda \"%1$s\" en %2$s!"
#: actions/nudge.php:85
msgid ""
@@ -2017,9 +2269,52 @@ msgid "Nudge sent"
msgstr "Se envió zumbido"
#: actions/nudge.php:97
-#, fuzzy
msgid "Nudge sent!"
-msgstr "¡Zumbido enviado!"
+msgstr "¡Codazo enviado!"
+
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Debes estar conectado para listar tus aplicaciones."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Aplicaciones OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Aplicaciones que has registrado"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Aún no has registrado aplicación alguna."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Aplicaciones conectadas"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Has permitido a las siguientes aplicaciones acceder a tu cuenta."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "No eres un usuario de esa aplicación."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "No se puede revocar el acceso para la aplicación: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "No has autorizado a ninguna aplicación utilizar tu cuenta."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Los desarrolladores pueden editar la configuración de registro de sus "
+"aplicaciones "
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
@@ -2031,16 +2326,15 @@ msgid "%1$s's status on %2$s"
msgstr "estado de %1$s en %2$s"
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "Conectarse"
+msgstr "tipo de contenido "
#: actions/oembed.php:160
msgid "Only "
-msgstr ""
+msgstr "Sólo "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -2053,9 +2347,8 @@ msgid "Notice Search"
msgstr "Búsqueda de avisos"
#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Otras configuraciones"
+msgid "Other settings"
+msgstr "Otros ajustes"
#: actions/othersettings.php:71
msgid "Manage various other options."
@@ -2063,54 +2356,52 @@ msgstr "Manejo de varias opciones adicionales."
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr "  (servicio gratuito)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Acortar las URL con"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Servicio de acorte automático a usar."
#: actions/othersettings.php:122
-#, fuzzy
msgid "View profile designs"
-msgstr "Configuración del perfil"
+msgstr "Ver diseños de perfil"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Ocultar o mostrar diseños de perfil."
#: actions/othersettings.php:153
-#, fuzzy
msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)."
+msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Grupo no especificado."
+msgstr "No se ha especificado ID de usuario."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "No se especificó perfil."
+msgstr "No se ha especificado un token de acceso."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Ningún perfil de Id en solicitud."
+msgstr "Token de acceso solicitado."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "El contenido del aviso es inválido"
+msgstr "Token de acceso inválido especificado."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ingresar a sitio"
+msgstr "Token de acceso caducado."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Bandeja de salida de %1$s - página %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2127,14 +2418,12 @@ msgid "Change password"
msgstr "Cambiar contraseña"
#: actions/passwordsettings.php:69
-#, fuzzy
msgid "Change your password."
-msgstr "Cambia tu contraseña."
+msgstr "Cambia tu contraseña"
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
msgid "Password change"
-msgstr "Cambio de contraseña "
+msgstr "Cambio de contraseña"
#: actions/passwordsettings.php:104
msgid "Old password"
@@ -2185,7 +2474,7 @@ msgstr "No se puede guardar la nueva contraseña."
msgid "Password saved."
msgstr "Se guardó Contraseña."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2193,142 +2482,150 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
-#, fuzzy, php-format
+#: actions/pathsadminpanel.php:157
+#, php-format
msgid "Theme directory not readable: %s"
-msgstr "Esta página no está disponible en un "
+msgstr "Directorio de temas ilegible: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "Directorio de fondo ilegible: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Servidor SSL no válido. La longitud máxima es de 255 caracteres."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
-#, fuzzy
msgid "Site"
-msgstr "Invitar"
+msgstr "Sitio"
+
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Servidor"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Aviso de sitio"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
-msgid "Theme"
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:237
-msgid "Theme server"
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:259
+msgid "Theme"
+msgstr "Tema"
+
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr "Servidor de los temas"
+
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
-msgstr ""
+msgstr "Directorio de temas"
-#: actions/pathsadminpanel.php:252
-#, fuzzy
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
-msgstr "Avatar"
+msgstr "Avatares"
-#: actions/pathsadminpanel.php:257
-#, fuzzy
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
-msgstr "Configuración de Avatar"
+msgstr "Servidor del avatar"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Avatar actualizado"
-#: actions/pathsadminpanel.php:265
-#, fuzzy
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
-msgstr "Avatar actualizado"
+msgstr "Directorio del avatar"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
-msgstr ""
+msgstr "Fondos"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
-msgstr ""
+msgstr "Servidor de fondo"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
-msgstr ""
+msgstr "Directorio del fondo"
-#: actions/pathsadminpanel.php:293
-#, fuzzy
+#: actions/pathsadminpanel.php:320
msgid "SSL"
-msgstr "SMS"
+msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
-#, fuzzy
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
-msgstr "Recuperar"
+msgstr "Nunca"
-#: actions/pathsadminpanel.php:297
-#, fuzzy
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
-msgstr "Avisos"
+msgstr "A veces"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
-msgstr ""
+msgstr "Siempre"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
-msgstr ""
+msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "Cuándo utilizar SSL"
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
-msgstr "Recuperar"
+msgstr "Servidor SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Aviso de sitio"
@@ -2347,9 +2644,9 @@ msgid "People search"
msgstr "Buscador de gente"
#: actions/peopletag.php:70
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s"
-msgstr "No es un tag de personas válido: %s"
+msgstr "No es una etiqueta válida para personas: %s"
#: actions/peopletag.php:144
#, fuzzy, php-format
@@ -2377,9 +2674,8 @@ msgstr ""
"sepa más sobre ti."
#: actions/profilesettings.php:99
-#, fuzzy
msgid "Profile information"
-msgstr "Información de perfil "
+msgstr "Información del perfil"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -2393,7 +2689,7 @@ msgid "Full name"
msgstr "Nombre completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página de inicio"
@@ -2402,14 +2698,13 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
#: actions/profilesettings.php:122 actions/register.php:461
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
+msgstr "Descríbete y cuéntanos tus intereses en %d caracteres"
#: actions/profilesettings.php:125 actions/register.php:464
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Descríbete y cuenta de tus "
+msgstr "Descríbete y cuéntanos acerca de tus intereses"
#: actions/profilesettings.php:127 actions/register.php:466
msgid "Bio"
@@ -2417,7 +2712,7 @@ msgstr "Biografía"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Ubicación"
@@ -2428,7 +2723,7 @@ msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Compartir mi ubicación actual al publicar los mensajes"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2441,7 +2736,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Idioma"
@@ -2465,11 +2760,11 @@ msgstr ""
"para no-humanos)"
#: actions/profilesettings.php:228 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
+msgstr "La biografía es muy larga (máx. %d caracteres)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Zona horaria no seleccionada"
@@ -2478,83 +2773,83 @@ msgid "Language is too long (max 50 chars)."
msgstr "Idioma es muy largo ( max 50 car.)"
#: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Tag no válido: '%s' "
+msgstr "Etiqueta inválida: \"% s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "No se pudo actualizar el usuario para autosuscribirse."
-#: actions/profilesettings.php:359
-#, fuzzy
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr "No se pudo guardar tags."
+msgstr "No se han podido guardar las preferencias de ubicación."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "No se pudo guardar el perfil."
-#: actions/profilesettings.php:379
-#, fuzzy
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
-msgstr "No se pudo guardar tags."
+msgstr "No se pudo guardar las etiquetas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Se guardó configuración."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Más allá del límite de páginas (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
msgstr "No se pudo acceder a corriente pública."
#: actions/public.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Public timeline, page %d"
-msgstr "Línea de tiempo pública, página %d"
+msgstr "Línea temporal pública, página %d"
#: actions/public.php:131 lib/publicgroupnav.php:79
msgid "Public timeline"
msgstr "Línea temporal pública"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Feed del flujo público"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Feed del flujo público"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Feed del flujo público"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Esta es la línea temporal pública de %%site.name%%, pero aún no se ha "
+"publicado nada."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
-msgstr ""
+msgstr "¡Sé la primera persona en publicar algo!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2563,7 +2858,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2574,9 +2869,8 @@ msgstr ""
"wiki/Micro-blogging) "
#: actions/publictagcloud.php:57
-#, fuzzy
msgid "Public tag cloud"
-msgstr "Nube de tags pública"
+msgstr "Nube de etiquetas pública"
#: actions/publictagcloud.php:63
#, php-format
@@ -2590,7 +2884,7 @@ msgstr ""
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "¡Sé la primera persona en publicar!"
#: actions/publictagcloud.php:75
#, php-format
@@ -2598,8 +2892,10 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
+"la primera persona en publicar uno?"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Nube de tags"
@@ -2642,14 +2938,16 @@ msgstr ""
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
msgstr ""
+"Se te ha identificado. Por favor, escribe una nueva contraseña a "
+"continuación. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Recuperación de contraseña"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Nombre de usuario o dirección de correo electrónico"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -2734,15 +3032,14 @@ msgid "Sorry, only invited people can register."
msgstr "Disculpa, sólo personas invitadas pueden registrarse."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Error con el código de confirmación."
+msgstr "El código de invitación no es válido."
#: actions/register.php:112
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -2784,7 +3081,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo electrónico"
@@ -2806,16 +3103,15 @@ msgid "Creative Commons Attribution 3.0"
msgstr ""
#: actions/register.php:497
-#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
msgstr ""
-"excepto los siguientes datos privados: contraseña, dirección de correo "
-"electrónico, dirección de mensajería instantánea, número de teléfono."
+"con excepción de esta información privada: contraseña, dirección de correo "
+"electrónico, dirección de mensajería instantánea y número de teléfono."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2832,20 +3128,20 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, "
-"puedes...\n"
+"¡Felicitaciones, %1$s! Te damos la bienvenida a %%%%site.name%%%%. Desde "
+"este momento, puede que quieras...\n"
"\n"
-"* Ir a [tu perfil](%s) y enviar tu primer mensaje.\n"
-"* Agregar una [cuenta Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar "
-"avisos por mensajes instantáneos.\n"
-"* [Buscar personas](%%%%action.peoplesearch%%%%) que podrías conoces o que "
-"comparte tus intereses.\n"
-"* Actualizar tus [opciones de perfil](%%%%action.profilesettings%%%%) para "
-"contar más sobre tí.\n"
-"* Leer la [documentación en línea](%%%%doc.help%%%%) para encontrar "
-"características pasadas por alto.\n"
+"* Ir a [tu perfil](%2$s) y publicar tu primer mensaje.\n"
+"* Añadir una [dirección Jabber/GTalk](%%%%action.imsettings%%%%) para poder "
+"enviar mensajes a través de mensajería instantanea.\n"
+"* [Buscar personas](%%%%action.peoplesearch%%%%) que conozcas o que "
+"compartan tus intereses. \n"
+"* Actualizar tu [configuración de perfil](%%%%action.profilesettings%%%%) "
+"para contarle a otros más sobre tí. \n"
+"* Leer los [documentos en línea](%%%%doc.help%%%%) para encontrar "
+"características que te hayas podido perder. \n"
"\n"
-"Gracias por suscribirte y esperamos que disfrutes el uso de este servicio."
+"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
#: actions/register.php:562
msgid ""
@@ -2872,17 +3168,16 @@ msgid "Remote subscribe"
msgstr "Subscripción remota"
#: actions/remotesubscribe.php:124
-#, fuzzy
msgid "Subscribe to a remote user"
-msgstr "Suscribirse a este usuario"
+msgstr "Suscribirse a un usuario remoto"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr "Apodo del usuario"
+msgstr "Usuario"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr "Apodo del usuario que quieres seguir"
+msgstr "Usuario a quien quieres seguir"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
@@ -2893,7 +3188,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Suscribirse"
@@ -2902,49 +3197,42 @@ msgid "Invalid profile URL (bad format)"
msgstr "El URL del perfil es inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
-#, fuzzy
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "URL de perfil no válido (ningún documento YADIS)."
+msgstr ""
+"No es un perfil válido URL (no se ha definido un documento YADIS o un XRDS "
+"inválido)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
-msgstr "¡Es un perfil local! Ingresa para suscribirte"
+msgstr "¡Este es un perfil local! Ingresa para suscribirte"
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
-msgstr "No se pudo obtener la señal de petición."
+msgstr "No se pudo obtener un token de solicitud"
#: actions/repeat.php:57
-#, fuzzy
msgid "Only logged-in users can repeat notices."
-msgstr "Sólo el usuario puede leer sus bandejas de correo."
+msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
msgid "No notice specified."
-msgstr "No se especificó perfil."
+msgstr "No se ha especificado un mensaje."
#: actions/repeat.php:76
-#, fuzzy
msgid "You can't repeat your own notice."
-msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
+msgstr "No puedes repetir tus propios mensajes."
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "Ya has bloqueado este usuario."
+msgstr "Ya has repetido este mensaje."
-#: actions/repeat.php:114 lib/noticelist.php:629
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
-msgstr "Crear"
+msgstr "Repetido"
#: actions/repeat.php:119
-#, fuzzy
msgid "Repeated!"
-msgstr "Crear"
+msgstr "¡Repetido!"
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -2952,6 +3240,11 @@ msgstr "Crear"
msgid "Replies to %s"
msgstr "Respuestas a %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Respuestas a %1$s, página %2$d"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2993,6 +3286,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Respuestas a %1$s en %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -3003,6 +3300,121 @@ msgstr "No puedes enviar mensaje a este usuario."
msgid "User is already sandboxed."
msgstr "El usuario te ha bloqueado."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sesiones"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Configuración de sesión para este sitio StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gestionar sesiones"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Guardar la configuración del sitio"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Debes estar conectado para dejar un grupo."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Perfil de la aplicación"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Icono"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nombre"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organización"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descripción"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Acciones de la aplicación"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Información de la aplicación"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL del token de solicitud"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL del token de acceso"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Autorizar URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "¿Estás seguro de que quieres eliminar este aviso?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Avisos favoritos de %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "No se pudo recibir avisos favoritos."
@@ -3052,25 +3464,28 @@ msgstr ""
msgid "%s group"
msgstr "Grupo %s"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Miembros del grupo %s, página %d"
+
#: actions/showgroup.php:218
-#, fuzzy
msgid "Group profile"
-msgstr "Perfil de grupo"
+msgstr "Perfil del grupo"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
-#, fuzzy
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Nota"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Alias"
#: actions/showgroup.php:293
msgid "Group actions"
@@ -3111,14 +3526,9 @@ msgstr "(Ninguno)"
msgid "All members"
msgstr "Todos los miembros"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Estadísticas"
-
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Crear"
+msgstr "Creado"
#: actions/showgroup.php:448
#, php-format
@@ -3142,9 +3552,8 @@ msgstr ""
"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
#: actions/showgroup.php:482
-#, fuzzy
msgid "Admins"
-msgstr "Admin"
+msgstr "Administradores"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3169,9 +3578,14 @@ msgid "Notice deleted."
msgstr "Aviso borrado"
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Avisos marcados con %s"
+msgstr "%s etiquetados"
+
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, página %2$d"
#: actions/showstream.php:122
#, fuzzy, php-format
@@ -3198,25 +3612,25 @@ msgstr "Feed de avisos de %s"
msgid "FOAF for %s"
msgstr "Bandeja de salida para %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3225,20 +3639,21 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
-#, fuzzy, php-format
+#: actions/showstream.php:248
+#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]"
-"(http://en.wikipedia.org/wiki/Micro-blogging) "
+"**% s ** tiene una cuenta en %%%%site.name%%%%, un servicio de "
+"[microblogueo] (http://en.wikipedia.org/wiki/Micro-blogging), basado en la "
+"herramienta de software libre [StatusNet] (http://status.net/). "
-#: actions/showstream.php:313
-#, fuzzy, php-format
+#: actions/showstream.php:305
+#, php-format
msgid "Repeat of %s"
-msgstr "Respuestas a %s"
+msgstr "Repetición de %s"
#: actions/silence.php:65 actions/unsilence.php:65
#, fuzzy
@@ -3252,213 +3667,151 @@ msgstr "El usuario te ha bloqueado."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Configuración básica de este sitio StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "No es una dirección de correo electrónico válida"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Idioma desconocido \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "La frecuencia de captura debe ser un número."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
-msgstr ""
+msgstr "General"
-#: actions/siteadminpanel.php:256
-#, fuzzy
+#: actions/siteadminpanel.php:242
msgid "Site name"
-msgstr "Aviso de sitio"
+msgstr "Nombre del sitio"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Nueva dirección de correo para postear a %s"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Vistas locales"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
-msgstr ""
+msgstr "Zona horaria predeterminada"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Zona horaria predeterminada del sitio; generalmente UTC."
-#: actions/siteadminpanel.php:295
-#, fuzzy
+#: actions/siteadminpanel.php:281
msgid "Default site language"
-msgstr "Lenguaje de preferencia"
-
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Recuperar"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Aceptar"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Privacidad"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Invitar"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Bloqueado"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
+msgstr "Idioma predeterminado del sitio"
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
-msgstr ""
+msgstr "Capturas"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
-msgstr ""
+msgstr "En un trabajo programado"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
-msgstr ""
+msgstr "Capturas de datos"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Las capturas se enviarán a este URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
-msgstr ""
+msgstr "Límites"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
-msgstr ""
+msgstr "Límite de texto"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Cantidad máxima de caracteres para los mensajes."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
-msgstr ""
-
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Configuración de Avatar"
+msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "Preferencias SMS"
+msgstr "Configuración de SMS"
#: actions/smssettings.php:69
#, php-format
@@ -3487,9 +3840,8 @@ msgid "Enter the code you received on your phone."
msgstr "Ingrese el código recibido en su teléfono"
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
-msgstr "Número telefónico para sms"
+msgstr "Número de teléfono de SMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3538,9 +3890,8 @@ msgid "That is not your phone number."
msgstr "Ese no es tu número telefónico"
#: actions/smssettings.php:465
-#, fuzzy
msgid "Mobile carrier"
-msgstr "Operador móvil"
+msgstr "Operador de telefonía móvil"
#: actions/smssettings.php:469
msgid "Select a carrier"
@@ -3561,29 +3912,36 @@ msgid "No code entered"
msgstr "No ingresó código"
#: actions/subedit.php:70
-#, fuzzy
msgid "You are not subscribed to that profile."
-msgstr "No estás suscrito a ese perfil."
+msgstr "No te has suscrito a ese perfil."
-#: actions/subedit.php:83
-#, fuzzy
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
-msgstr "No se pudo guardar suscripción."
+msgstr "No se ha podido guardar la suscripción."
+
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:55
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "No es usuario local."
+msgid "No such profile."
+msgstr "No existe tal archivo."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "No te has suscrito a ese perfil."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Suscrito"
#: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
msgid "%s subscribers"
-msgstr "Suscriptores %s"
+msgstr "%s suscriptores"
#: actions/subscribers.php:52
#, fuzzy, php-format
@@ -3636,7 +3994,7 @@ msgstr "Estas son las personas que escuchas sus avisos."
msgid "These are the people whose notices %s listens to."
msgstr "Estas son las personas que %s escucha sus avisos."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3646,20 +4004,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s ahora está escuchando "
+msgstr "%s no está escuchando a nadie."
-#: actions/subscriptions.php:194
-#, fuzzy
+#: actions/subscriptions.php:199
msgid "Jabber"
-msgstr "Jabber "
+msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Usuarios auto marcados con %s - página %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3686,11 +4048,11 @@ msgid "Tag %s"
msgstr "%s tag"
#: actions/tagother.php:77 lib/userprofile.php:75
-#, fuzzy
msgid "User profile"
msgstr "Perfil de usuario"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3713,9 +4075,8 @@ msgstr ""
"suscritas a ti."
#: actions/tagother.php:200
-#, fuzzy
msgid "Could not save tags."
-msgstr "No se pudo guardar tags."
+msgstr "No se han podido guardar las etiquetas."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -3745,15 +4106,14 @@ msgid "User is not silenced."
msgstr "El usuario no tiene un perfil."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile id in request."
-msgstr "Ningún perfil de Id en solicitud."
+msgstr "No hay id de perfil solicitado."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
msgstr "Desuscrito"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3766,91 +4126,66 @@ msgstr "Usuario"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Configuración de usuarios en este sitio StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Límite para la bio inválido: Debe ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
-msgstr ""
+msgstr "Límite de la bio"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Longitud máxima de bio de perfil en caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nuevos usuarios"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
-msgstr ""
+msgstr "Bienvenida a nuevos usuarios"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Texto de bienvenida para nuevos usuarios (máx. 255 caracteres)."
-#: actions/useradminpanel.php:241
-#, fuzzy
+#: actions/useradminpanel.php:240
msgid "Default subscription"
-msgstr "Todas las suscripciones"
+msgstr "Suscripción predeterminada"
-#: actions/useradminpanel.php:242
-#, fuzzy
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
-"para no-humanos)"
+msgstr "Suscribir automáticamente nuevos usuarios a este usuario."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Invitaciones"
-#: actions/useradminpanel.php:256
-#, fuzzy
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
-msgstr "Invitacion(es) enviada(s)"
+msgstr "Invitaciones habilitadas"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sesiones"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar la suscripción"
@@ -3865,37 +4200,36 @@ msgstr ""
"avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, "
"haz clic en \"Cancelar\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licencia"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Aceptar"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
-#, fuzzy
msgid "Subscribe to this user"
msgstr "Suscribirse a este usuario"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Rechazar"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Rechazar esta suscripción"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "¡Ninguna petición de autorización!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Suscripción autorizada"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3906,11 +4240,11 @@ msgstr ""
"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
"identificador de suscripción es:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Suscripción rechazada"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3921,45 +4255,44 @@ msgstr ""
"de nuevo las instrucciones para saber cómo rechazar la suscripción "
"completamente."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "No se puede leer el URL del avatar '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Tipo de imagen incorrecto para '%s'"
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
msgid "Profile design"
-msgstr "Configuración del perfil"
+msgstr "Diseño del perfil"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
@@ -3971,10 +4304,14 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Miembros del grupo %s, página %d"
+
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Buscar personas o texto"
+msgstr "Buscar más grupos"
#: actions/usergroups.php:153
#, fuzzy, php-format
@@ -3997,15 +4334,12 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Status borrado."
+"Este sitio ha sido desarrollado con %1$s, versión %2$s, Derechos Reservados "
+"2008-2010 StatusNet, Inc. y sus colaboradores."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Colaboradores"
#: actions/version.php:168
msgid ""
@@ -4032,25 +4366,16 @@ msgstr ""
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
-
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Apodo"
+msgstr "Complementos"
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Sesiones"
#: actions/version.php:197
msgid "Author(s)"
-msgstr ""
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descripción"
+msgstr "Autor(es)"
#: classes/File.php:144
#, php-format
@@ -4075,9 +4400,8 @@ msgid "Group join failed."
msgstr "Perfil de grupo"
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "No se pudo actualizar el grupo."
+msgstr "No es parte del grupo."
#: classes/Group_member.php:60
#, fuzzy
@@ -4090,9 +4414,8 @@ msgid "Could not create login token for %s"
msgstr "No se pudo crear favorito."
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Error al enviar mensaje directo."
+msgstr "Se te ha inhabilitado para enviar mensajes directos."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -4102,29 +4425,27 @@ msgstr "No se pudo insertar mensaje."
msgid "Could not update message with new URI."
msgstr "No se pudo actualizar mensaje con nuevo URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Error de la BD al insertar la etiqueta clave: %s"
-#: classes/Notice.php:225
-#, fuzzy
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
-msgstr "Hubo un problema al guardar el aviso."
+msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
-#: classes/Notice.php:229
-#, fuzzy
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
-msgstr "Hubo problemas al guardar el aviso. Usuario desconocido."
+msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
"minutos."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4133,34 +4454,60 @@ msgstr ""
"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
"minutos."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD al insertar respuesta: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Se te ha prohibido la suscripción."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "El usuario te ha bloqueado."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "¡No estás suscrito!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "No se pudo eliminar la suscripción."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "No se pudo eliminar la suscripción."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenido a %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "No se pudo crear grupo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "No se pudo configurar miembros de grupo."
@@ -4194,137 +4541,132 @@ msgid "Other options"
msgstr "Otras opciones"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Página sin título"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Inicio"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea de tiempo de amigos"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Cuenta"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Conectarse"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Conectar a los servicios"
-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:448
msgid "Change site configuration"
-msgstr "Navegación de sitio primario"
+msgstr "Cambiar la configuración del sitio"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amigos y colegas a unirse a %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Salir"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Salir de sitio"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crear una cuenta"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ingresar a sitio"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ayuda"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ayúdame!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Aviso de sitio"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistas locales"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Aviso de página"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Acerca de"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Preguntas Frecuentes"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidad"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Fuente"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Insignia"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4333,12 +4675,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblogueo."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4349,38 +4691,61 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Derechos de autor de contenido y datos por los colaboradores. Todos los "
+"derechos reservados."
+
+#: lib/action.php:827
msgid "All "
msgstr "Todo"
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Después"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Antes"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Hubo problemas con tu clave de sesión."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
-#, fuzzy
msgid "You cannot make changes to this site."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puedes hacer cambios a este sitio."
#: lib/adminpanelaction.php:107
#, fuzzy
@@ -4403,27 +4768,114 @@ msgid "Unable to delete design setting."
msgstr "¡No se pudo guardar tu configuración de Twitter!"
#: lib/adminpanelaction.php:312
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Confirmación de correo electrónico"
+msgstr "Configuración básica del sitio"
#: lib/adminpanelaction.php:317
-#, fuzzy
msgid "Design configuration"
-msgstr "SMS confirmación"
+msgstr "Configuración del diseño"
+
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Configuración de usuario"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Configuración de acceso"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS confirmación"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Configuración de sesiones"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Editar aplicación"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Describir al grupo o tema en %d caracteres"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Describir al grupo o tema"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "La URL de origen"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "El URL de página de inicio o blog del grupo or tema"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organización responsable de esta aplicación"
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "El URL de página de inicio o blog del grupo or tema"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Navegador"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Escritorio"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Tipo de aplicación, de navegador o de escritorio"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Revocar"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#: lib/attachmentlist.php:278
msgid "Provider"
@@ -4431,18 +4883,17 @@ msgstr "Proveedor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Mensajes donde aparece este adjunto"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Etiquetas de este archivo adjunto"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
-#, fuzzy
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
-msgstr "Cambio de contraseña "
+msgstr "El cambio de contraseña ha fallado"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Cambio de contraseña "
@@ -4464,10 +4915,9 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Disculpa, todavía no se implementa este comando."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
-"No se pudo actualizar el usuario con la dirección de correo confirmada."
+msgstr "No se pudo encontrar a nadie con el nombre de usuario %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
@@ -4487,9 +4937,8 @@ msgid ""
msgstr ""
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "Ningún perfil con ese ID."
+msgstr "No existe ningún mensaje con ese id"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
@@ -4598,80 +5047,89 @@ msgstr "Hubo un problema al guardar el aviso."
msgid "Specify the name of the user to subscribe to"
msgstr "Especificar el nombre del usuario a suscribir"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "No existe ese usuario."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especificar el nombre del usuario para desuscribirse de"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscrito de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Todavía no se implementa comando."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificación no activa."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "No se puede desactivar notificación."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificación activada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Desuscrito de %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a nadie."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ya estás suscrito a estos usuarios:"
msgstr[1] "Ya estás suscrito a estos usuarios:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Nadie está suscrito a ti."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "No eres miembro de ningún grupo"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "No eres miembro de este grupo."
-msgstr[1] "No eres miembro de este grupo."
+msgstr[0] "Eres miembro de este grupo:"
+msgstr[1] "Eres miembro de estos grupos:"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4685,6 +5143,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4712,19 +5171,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ningún archivo de configuración encontrado. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -4740,6 +5199,15 @@ msgstr "Actualizaciones por mensajería instantánea"
msgid "Updates by SMS"
msgstr "Actualizaciones por sms"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Conectarse"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4773,11 +5241,11 @@ msgstr "Aceptar"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
@@ -4927,12 +5395,12 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5143,7 +5611,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "desde"
@@ -5263,58 +5731,54 @@ msgid "Do not share my location"
msgstr "No se pudo guardar tags."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "en"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "en contexto"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder este aviso."
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Aviso borrado"
@@ -5347,11 +5811,7 @@ msgstr "Error al insertar perfil remoto"
msgid "Duplicate notice"
msgstr "Duplicar aviso"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Se te ha prohibido la suscripción."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "No se pudo insertar una nueva suscripción."
@@ -5367,19 +5827,19 @@ msgstr "Respuestas"
msgid "Favorites"
msgstr "Favoritos"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Bandeja de Entrada"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Mensajes entrantes"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Bandeja de Salida"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Mensajes enviados"
@@ -5461,6 +5921,10 @@ msgstr "Responder este aviso."
msgid "Repeat this notice"
msgstr "Responder este aviso."
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5533,36 +5997,6 @@ msgstr "Personas suscritas a %s"
msgid "Groups %s is a member of"
msgstr "%s es miembro de los grupos"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "El usuario te ha bloqueado."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "No se pudo suscribir."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "No se pudo suscribir otro a ti."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "¡No estás suscrito!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "No se pudo eliminar la suscripción."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "No se pudo eliminar la suscripción."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5615,67 +6049,67 @@ msgstr "editar avatar"
msgid "User actions"
msgstr "Acciones de usuario"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Editar configuración del perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar un mensaje directo a este usuario"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Mensaje"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "hace un año"
@@ -5689,7 +6123,7 @@ msgstr ""
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index bd97b86b5..600323e43 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:13+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:38+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,9 +20,64 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "دسترسی"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "تنظیمات دیگر"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "ثبت نام"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "خصوصی"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Ùقط دعوت کردن"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "تنها آماده کردن دعوت نامه های ثبت نام."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "مسدود"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "غیر ÙØ¹Ø§Ù„ کردن نام نوبسی جدید"
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "ذخیره‌کردن"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "تنظیمات چهره"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -37,25 +92,29 @@ msgstr "چنین ØµÙØ­Ù‡â€ŒØ§ÛŒ وجود ندارد"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "چنین کاربری وجود ندارد."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s کاربران مسدود شده، ØµÙØ­Ù‡â€ŒÛŒ %d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -100,7 +159,7 @@ msgstr ""
"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
"s) پیام Ù…ÛŒâ€ŒÙØ±Ø³ØªØ¯."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -113,8 +172,8 @@ msgstr ""
msgid "You and friends"
msgstr "شما و دوستان"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "به روز رسانی از %1$ و دوستان در %2$"
@@ -124,23 +183,23 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "رابط مورد نظر پیدا نشد."
@@ -154,7 +213,7 @@ msgstr "رابط مورد نظر پیدا نشد."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "برای Ø§Ø³ØªÙØ§Ø¯Ù‡ از این روش باید اطلاعات را به صورت پست Ø¨ÙØ±Ø³ØªÛŒØ¯"
@@ -183,8 +242,9 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -302,11 +362,11 @@ msgstr "نمی‌توانید خودتان را دنبال نکنید!"
msgid "Two user ids or screen_names must be supplied."
msgstr "باید ۲ شناسه‌ی کاربر یا نام ظاهری وارد کنید."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "نمی‌توان کاربر منبع را تعیین کرد."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "نمی‌توان کاربر هد٠را پیدا کرد."
@@ -328,7 +388,8 @@ msgstr "این لقب در حال حاضر ثبت شده است. Ù„Ø·ÙØ§ یکی
msgid "Not a valid nickname."
msgstr "لقب نا معتبر."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -340,7 +401,8 @@ msgstr "برگهٔ آغازین یک نشانی معتبر نیست."
msgid "Full name is too long (max 255 chars)."
msgstr "نام کامل طولانی است (۲۵۵ حر٠در حالت بیشینه(."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "توصی٠بسیار زیاد است (حداکثر %d حرÙ)."
@@ -376,7 +438,7 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "گروه ÛŒØ§ÙØª نشد!"
@@ -417,6 +479,114 @@ msgstr "%s گروه"
msgid "groups on %s"
msgstr "گروه‌ها در %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "اندازه‌ی نادرست"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "مشکلی در Ø¯Ø±ÛŒØ§ÙØª جلسه‌ی شما وجود دارد. Ù„Ø·ÙØ§ بعدا سعی کنید."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "نام کاربری یا کلمه ی عبور نا معتبر."
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "ارسال غیر قابل انتظار ÙØ±Ù…."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "حساب کاربری"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "نام کاربری"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "گذرواژه"
+
+#: actions/apioauthauthorize.php:328
+#, fuzzy
+msgid "Deny"
+msgstr "طرح"
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "همه"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "این روش نیازمند POST یا DELETE است."
@@ -446,17 +616,17 @@ msgstr "وضعیت حذ٠شد."
msgid "No status with that ID found."
msgstr "هیچ وضعیتی با آن شناسه ÛŒØ§ÙØª نشد."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حر٠است."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "ÛŒØ§ÙØª نشد"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "حداکثر طول پیام %d حر٠است که شامل ضمیمه نیز می‌باشد"
@@ -470,7 +640,7 @@ msgstr "قالب پشتیبانی نشده."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / دوست داشتنی از %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
@@ -481,7 +651,7 @@ msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
msgid "%s timeline"
msgstr "خط زمانی %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -497,27 +667,22 @@ msgstr "%$1s / به روز رسانی های شامل %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s خط‌زمانی عمومی"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s به روز رسانی های عموم"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "%s تکرار کرد"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "تکرار %s"
@@ -527,7 +692,7 @@ msgstr "تکرار %s"
msgid "Notices tagged with %s"
msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
@@ -588,8 +753,8 @@ msgstr "اصلی"
msgid "Preview"
msgstr "پیش‌نمایش"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "حذÙ"
@@ -601,29 +766,6 @@ msgstr "پایین‌گذاری"
msgid "Crop"
msgstr "برش"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "مشکلی در Ø¯Ø±ÛŒØ§ÙØª جلسه‌ی شما وجود دارد. Ù„Ø·ÙØ§ بعدا سعی کنید."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "ارسال غیر قابل انتظار ÙØ±Ù…."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد."
@@ -663,8 +805,9 @@ msgstr ""
"دنبال کند. همچنین دیگر شما از پیام‌هایی که در آن از شما یاد می‌کند با خبر "
"نخواهید شد"
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "خیر"
@@ -672,13 +815,13 @@ msgstr "خیر"
msgid "Do not block this user"
msgstr "کاربر را مسدود نکن"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "بله"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "کاربر را مسدود کن"
@@ -761,7 +904,8 @@ msgid "Couldn't delete email confirmation."
msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "تایید نشانی"
#: actions/confirmaddress.php:159
@@ -778,10 +922,57 @@ msgstr "مکالمه"
msgid "Notices"
msgstr "پیام‌ها"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "برای ویرایش گروه باید وارد شوید."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "ابن خبر ذخیره ای ندارد ."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "شما یک عضو این گروه نیستید."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "چنین پیامی وجود ندارد."
+
+#: actions/deleteapplication.php:149
+#, fuzzy
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"آیا مطمئن هستید که می‌خواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات "
+"پاک و بدون برگشت خواهند بود."
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "این پیام را پاک نکن"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "این پیام را پاک کن"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -812,7 +1003,7 @@ msgstr "آیا اطمینان دارید Ú©Ù‡ می‌خواهید این پیاÙ
msgid "Do not delete this notice"
msgstr "این پیام را پاک نکن"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "این پیام را پاک کن"
@@ -944,16 +1135,6 @@ msgstr "بازگرداندن طرح‌های Ù¾ÛŒØ´â€ŒÙØ±Ø¶"
msgid "Reset back to default"
msgstr "برگشت به حالت پیش گزیده"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "ذخیره‌کردن"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "ذخیره‌کردن طرح"
@@ -966,10 +1147,85 @@ msgstr "این آگهی یک آگهی برگزیده نیست!"
msgid "Add to favorites"
msgstr "Ø§ÙØ²ÙˆØ¯Ù† به علاقه‌مندی‌ها"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "چنین سندی وجود ندارد."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "انتخابات دیگر"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "برای ویرایش گروه باید وارد شوید."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "چنین پیامی وجود ندارد."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "از این روش برای ویرایش گروه Ø§Ø³ØªÙØ§Ø¯Ù‡ کنید."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "نام کامل طولانی است (۲۵۵ حر٠در حالت بیشینه(."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "این لقب در حال حاضر ثبت شده است. Ù„Ø·ÙØ§ یکی دیگر انتخاب کنید."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr ""
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "برگهٔ آغازین یک نشانی معتبر نیست."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "مکان طولانی است (حداکثر Û²ÛµÛµ حرÙ)"
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -998,7 +1254,7 @@ msgstr "توصی٠بسیار زیاد است (حداکثر %d حرÙ)."
msgid "Could not update group."
msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "نمی‌توان نام‌های مستعار را ساخت."
@@ -1038,7 +1294,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "انصراÙ"
@@ -1120,7 +1377,7 @@ msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "یک آدرس ایمیل معتبر نیست."
@@ -1132,7 +1389,7 @@ msgstr "هم اکنون نشانی شما همین است."
msgid "That email address already belongs to another user."
msgstr "این نشانی در حال حاضر متعلق به ÙØ±Ø¯ دیگری است."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "نمی‌توان کد تایید را اضاÙÙ‡ کرد."
@@ -1193,7 +1450,7 @@ msgstr "این پیام هم اکنون دوست داشتنی شده است."
msgid "Disfavor favorite"
msgstr "دوست ندارم"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "آگهی‌های محبوب"
@@ -1339,7 +1596,7 @@ msgstr "هم اکنون دسترسی کاربر به گروه مسدود شده
msgid "User is not a member of group."
msgstr "کاربر عضو گروه نیست."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "دسترسی کاربر به گروه را مسدود کن"
@@ -1431,23 +1688,23 @@ msgstr "اعضای گروه %sØŒ ØµÙØ­Ù‡Ù” %d"
msgid "A list of the users in this group."
msgstr "یک Ùهرست از کاربران در این گروه"
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "مدیر"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "بازداشتن"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "کاربر یک مدیر گروه شود"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "مدیر شود"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "این کاربر یک مدیر شود"
@@ -1626,6 +1883,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "این شناسه‌ی Jabber شما نیست."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "صندوق ورودی %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1705,7 +1967,7 @@ msgstr "پیام خصوصی"
msgid "Optionally add a personal message to the invitation."
msgstr "اگر دوست دارید می‌توانید یک پیام به همراه دعوت نامه ارسال کنید."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "ÙØ±Ø³ØªØ§Ø¯Ù†"
@@ -1779,7 +2041,7 @@ msgstr "نام کاربری یا رمز عبور نادرست."
msgid "Error setting user. You are probably not authorized."
msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ورود"
@@ -1788,17 +2050,6 @@ msgstr "ورود"
msgid "Login to site"
msgstr "ورود به وب‌گاه"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "نام کاربری"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "گذرواژه"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "مرا به یاد بسپار"
@@ -1828,21 +2079,21 @@ msgstr ""
"با نام‌کاربری و گذزواژه‌ی خود وارد شوید. نام‌کاربری ندارید؟ یک نام‌کاربری [ثبت ]"
"(%%action.register%%) کنید."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Ùقط یک مدیر می‌تواند کاربر دیگری را مدیر کند."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%s از قبل مدیر گروه %s بود."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "نمی‌توان اطلاعات عضویت %s را در گروه %s به دست آورد."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "نمی‌توان %s را مدیر گروه %s کرد."
@@ -1851,6 +2102,30 @@ msgstr "نمی‌توان %s را مدیر گروه %s کرد."
msgid "No current status"
msgstr "بدون وضعیت ÙØ¹Ù„ÛŒ"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "چنین پیامی وجود ندارد."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "برای ساخت یک گروه، باید وارد شده باشید."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "از این ÙØ±Ù… برای ساختن یک گروه جدید Ø§Ø³ØªÙØ§Ø¯Ù‡ کنید"
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "نمی‌توان نام‌های مستعار را ساخت."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "گروه جدید"
@@ -1963,6 +2238,51 @@ msgstr "ÙØ±ØªØ§Ø¯Ù† اژیر"
msgid "Nudge sent!"
msgstr "سقلمه ÙØ±Ø³ØªØ§Ø¯Ù‡ شد!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "برای ویرایش گروه باید وارد شوید."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "انتخابات دیگر"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "شما یک کاربر این گروه نیستید."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "ابن خبر ذخیره ای ندارد ."
@@ -1980,8 +2300,8 @@ msgstr "نوع محتوا "
msgid "Only "
msgstr " Ùقط"
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -1994,7 +2314,8 @@ msgid "Notice Search"
msgstr "جست‌وجوی آگهی‌ها"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "تنظیمات دیگر"
#: actions/othersettings.php:71
@@ -2049,6 +2370,11 @@ msgstr "علامت بی اعتبار یا منقضی."
msgid "Login token expired."
msgstr "ورود به وب‌گاه"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "ÙØ±Ø³ØªØ§Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2121,7 +2447,7 @@ msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد."
msgid "Password saved."
msgstr "گذرواژه ذخیره شد."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "مسیر ها"
@@ -2129,133 +2455,149 @@ msgstr "مسیر ها"
msgid "Path and server settings for this StatusNet site."
msgstr "تنظیمات و نشانی محلی این سایت استاتوس‌نتی"
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "شاخه‌ی پوسته‌ها خواندنی نیست: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "شاخه‌ی چهره‌ها نوشتنی نیست: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "شاخه‌ی پس زمینه‌ها نوشتنی نیست: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "پوشه‌ی تنظیمات محلی خواندنی نیست: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "سایت"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "کارگزار"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "مسیر"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "مسیر وب‌گاه"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "نشانی تنظیمات محلی"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "پوسته"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "کارگزار پوسته"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "مسیر پوسته"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "شاخهٔ پوسته"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "چهره‌ها"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "کارگزار نیم‌رخ"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "مسیر نیم‌رخ"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "شاخهٔ نیم‌رخ"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "پس زمینه‌ها"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "کارگذار تصاویر پیش‌زمینه"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "مسیر تصاویر پیش‌زمینه"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "شاخهٔ تصاویر پیش‌زمینه"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "هیچ وقت"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "گاهی اوقات"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "برای همیشه"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ از SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "کارگزار"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "نشانی ذخیره سازی"
@@ -2317,7 +2659,7 @@ msgid "Full name"
msgstr "نام‌کامل"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ØµÙØ­Ù‡Ù” خانگی"
@@ -2340,7 +2682,7 @@ msgstr "شرح‌حال"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "موقعیت"
@@ -2364,7 +2706,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "زبان"
@@ -2390,7 +2732,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "منطقه‌ی زمانی انتخاب نشده است."
@@ -2403,23 +2745,23 @@ msgstr "کلام بسیار طولانی است( حداکثر ÛµÛ° کاراکتØ
msgid "Invalid tag: \"%s\""
msgstr "نشان نادرست »%s«"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "نمی‌توان شناسه را ذخیره کرد."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "نمی‌توان نشان را ذخیره کرد."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "تنظیمات ذخیره شد."
@@ -2441,36 +2783,36 @@ msgstr "خط زمانی عمومی، ØµÙØ­Ù‡â€ŒÛŒ %d"
msgid "Public timeline"
msgstr "خط زمانی عمومی"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr ""
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "اولین کسی باشید Ú©Ù‡ پیام Ù…ÛŒâ€ŒÙØ±Ø³ØªØ¯!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr "چرا [ثبت نام](%%action.register%%) نمی‌کنید Ùˆ اولین پیام را Ù†Ù…ÛŒâ€ŒÙØ±Ø³ØªÛŒØ¯ØŸ"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2479,7 +2821,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2512,7 +2854,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2652,7 +2994,7 @@ msgstr "با عرض ØªØ§Ø³ÙØŒ کد دعوت نا معتبر است."
msgid "Registration successful"
msgstr "ثبت نام با موÙقیت انجام شد."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
@@ -2692,7 +3034,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "پست الکترونیکی"
@@ -2780,7 +3122,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -2816,7 +3158,7 @@ msgstr "شما نمی توانید Ø¢Ú¯Ù‡ÛŒ خودتان را تکرار Ú©Ù†ÛŒØ
msgid "You already repeated that notice."
msgstr "شما قبلا آن آگهی را تکرار کردید."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr ""
@@ -2830,6 +3172,11 @@ msgstr ""
msgid "Replies to %s"
msgstr "پاسخ‌های به %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "پاسخ‌های به %s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2873,6 +3220,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "وضعیت حذ٠شد."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2881,6 +3233,126 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "تنظیمات ظاهری برای این سایت."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr ""
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "ابن خبر ذخیره ای ندارد ."
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "نام کاربری"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "ØµÙØ­Ù‡ بندى"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr ""
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "آمار"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "مؤلÙ"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "آیا اطمینان دارید که می‌خواهید این پیام را پاک کنید؟"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "دوست داشتنی های %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "ناتوان در بازیابی آگهی های محبوب."
@@ -2930,17 +3402,22 @@ msgstr "این یک راه است برای به اشتراک گذاشتن آنچ
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "اعضای گروه %sØŒ ØµÙØ­Ù‡Ù” %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr ""
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr ""
@@ -2986,10 +3463,6 @@ msgstr "هیچ"
msgid "All members"
msgstr "همه ی اعضا"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "آمار"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "ساخته شد"
@@ -3044,6 +3517,11 @@ msgstr ""
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s کاربران مسدود شده، ØµÙØ­Ù‡â€ŒÛŒ %d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3069,12 +3547,12 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3082,7 +3560,7 @@ msgstr ""
"اخیرا چیز جالب توجه ای دیده اید؟ شما تا کنون آگهی ارسال نکرده اید، الان می "
"تواند زمان خوبی برای شروع باشد :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, fuzzy, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3091,7 +3569,7 @@ msgstr ""
"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
"s) پیام Ù…ÛŒâ€ŒÙØ±Ø³ØªØ¯."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3100,7 +3578,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3108,7 +3586,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr ""
@@ -3125,198 +3603,146 @@ msgstr "کاربر قبلا ساکت شده است."
msgid "Basic settings for this StatusNet site."
msgstr "تنظیمات پایه ای برای این سایت StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "نام سایت باید طولی غیر ØµÙØ± داشته باشد."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "شما باید یک آدرس ایمیل قابل قبول برای ارتباط داشته باشید"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "نام وب‌گاه"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "نام وب‌گاه شما، مانند «میکروبلاگ شرکت شما»"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "أورده شده به وسیله ی"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "محلی"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "منطقه ÛŒ زمانی پیش ÙØ±Ø¶"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "منظقه ÛŒ زمانی پیش ÙØ±Ø¶ برای سایت؛ معمولا UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "زبان پیش ÙØ±Ø¶ سایت"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "کارگزار"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "دسترسی"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "خصوصی"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Ùقط دعوت کردن"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "تنها آماده کردن دعوت نامه های ثبت نام."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "مسدود"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "غیر ÙØ¹Ø§Ù„ کردن نام نوبسی جدید"
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "محدودیت ها"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "محدودیت متن"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "بیشینهٔ تعداد حرو٠برای آگهی‌ها"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"چه مدت کاربران باید منتظر بمانند ( به ثانیه ) تا همان چیز را مجددا ارسال "
"کنند."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr ""
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3417,15 +3843,26 @@ msgstr "کدی وارد نشد"
msgid "You are not subscribed to that profile."
msgstr "شما به این پروÙيل متعهد نشدید"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr ""
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "چنین پرونده‌ای وجود ندارد."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "شما به این پروÙيل متعهد نشدید"
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3485,7 +3922,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3495,19 +3932,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "کاربران خود برچسب‌گذاری شده با %s - ØµÙØ­Ù‡Ù” %d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3536,7 +3978,8 @@ msgstr ""
msgid "User profile"
msgstr "Ù¾Ø±ÙˆÙØ§ÛŒÙ„ کاربر"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3591,7 +4034,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr ""
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3606,84 +4049,64 @@ msgstr "کاربر"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "حداکثر طول یک زندگی نامه(در Ù¾Ø±ÙˆÙØ§ÛŒÙ„) بر حسب کاراکتر."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "خوشامدگویی کاربر جدید"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "پیام خوشامدگویی برای کاربران جدید( حداکثر 255 کاراکتر)"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr ""
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr ""
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "دعوت نامه ها"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "دعوت نامه ها ÙØ¹Ø§Ù„ شدند"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "خواه به کاربران اجازه ی دعوت کردن کاربران جدید داده شود."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3695,84 +4118,84 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "لیسانس"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Ù¾Ø°ÛŒØ±ÙØªÙ†"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "تصویب این کاریر"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "رد کردن"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr ""
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr ""
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr ""
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3791,6 +4214,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "از هات داگ خود لذت ببرید!"
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "اعضای گروه %sØŒ ØµÙØ­Ù‡Ù” %d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "جستجو برای گروه های بیشتر"
@@ -3817,11 +4245,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "وضعیت حذ٠شد."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3853,12 +4276,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "نام کاربری"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "شخصی"
@@ -3868,10 +4286,6 @@ msgstr "شخصی"
msgid "Author(s)"
msgstr "مؤلÙ"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3919,27 +4333,27 @@ msgstr "پیغام نمی تواند درج گردد"
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال "
"کنید."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -3947,34 +4361,58 @@ msgstr ""
"تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا "
"ارسال کنید."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "شما از ÙØ±Ø³ØªØ§Ø¯Ù† پست در این سایت مردود شدید ."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "قبلا تایید شده !"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "تایید نشده!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr ""
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "خوش امدید به %1$s , @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "نمیتوان گروه را تشکیل داد"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr ""
@@ -4015,140 +4453,136 @@ msgstr "%s گروه %s را ترک کرد."
msgid "Untitled page"
msgstr "ØµÙØ­Ù‡ ÛŒ بدون عنوان"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "خانه"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-msgid "Account"
-msgstr "حساب کاربری"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "آدرس ایمیل، آواتار، کلمه ÛŒ عبور، Ù¾Ø±ÙˆÙØ§ÛŒÙ„ خود را تغییر دهید"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "وصل‌شدن"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "متصل شدن به خدمات"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "تغییر پیکربندی سایت"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "دعوت‌کردن"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "خروج"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "خارج شدن از سایت ."
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "یک حساب کاربری بسازید"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ú©Ù…Ú©"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "جست‌وجو"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "جستجو برای شخص با متن"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "خبر سایت"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "دید محلی"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "خبر ØµÙØ­Ù‡"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "دربارهٔ"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "سوال‌های رایج"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "خصوصی"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "منبع"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "تماس"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم Ø§ÙØ²Ø§Ø±"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4156,32 +4590,54 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "مجوز محتویات سایت"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "همه "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "مجوز."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "ØµÙØ­Ù‡ بندى"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل از"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4213,10 +4669,101 @@ msgstr "پیکره بندی اصلی سایت"
msgid "Design configuration"
msgstr ""
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "پیکره بندی اصلی سایت"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "پیکره بندی اصلی سایت"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr ""
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "پیکره بندی اصلی سایت"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr ""
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr ""
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "منبع"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "حذÙ"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "ضمائم"
@@ -4237,12 +4784,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "تغییر گذرواژه"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "تغییر گذرواژه"
@@ -4398,77 +4945,87 @@ msgstr "خطا هنگام ذخیره ی آگهی"
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "چنین کاربری وجود ندارد."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "دستور هنوز اجرا نشده"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "ناتوان در خاموش کردن آگاه سازی."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "آگاه سازی ÙØ¹Ø§Ù„ است."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "ناتوان در روشن کردن آگاه سازی."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "ÙØ±Ù…ان ورود از کار Ø§ÙØªØ§Ø¯Ù‡ است"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "مشترک‌ها"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "شما توسط هیچ کس تصویب نشده اید ."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "هیچکس شما را تایید نکرده ."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "هیچکس شما را تایید نکرده ."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "شما در هیچ گروهی عضو نیستید ."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "شما یک عضو این گروه نیستید."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4482,6 +5039,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4509,19 +5067,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "برو به نصاب."
@@ -4537,6 +5095,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr "به روز رسانی با پیامک"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "وصل‌شدن"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "خطای پایگاه داده"
@@ -4720,12 +5287,12 @@ msgstr "مگابایت"
msgid "kB"
msgstr "کیلوبایت"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -4926,7 +5493,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "از"
@@ -5045,57 +5612,53 @@ msgid "Do not share my location"
msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "در"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "در زمینه"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "تکرار از"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "به این آگهی جواب دهید"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "جواب دادن"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "آگهی تکرار شد"
@@ -5127,11 +5690,7 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5147,19 +5706,19 @@ msgstr "پاسخ ها"
msgid "Favorites"
msgstr "چیزهای مورد علاقه"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "صندوق Ø¯Ø±ÛŒØ§ÙØªÛŒ"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "پیام های وارد شونده ی شما"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "صندوق خروجی"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "پیام های ÙØ±Ø³ØªØ§Ø¯Ù‡ شده به وسیله ÛŒ شما"
@@ -5237,6 +5796,10 @@ msgstr "به این آگهی جواب دهید"
msgid "Repeat this notice"
msgstr ""
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5304,34 +5867,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr "هست عضو %s گروه"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "قبلا تایید شده !"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "تایید نشده!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr ""
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5382,67 +5917,67 @@ msgstr "ویرایش اواتور"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "ویرایش تنظیمات پروÙيل"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "ویرایش"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "پیام مستقیم به این کاربر Ø¨ÙØ±Ø³ØªÛŒØ¯"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "پیام"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "حدود یک روز پیش"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "حدود یک سال پیش"
@@ -5456,7 +5991,7 @@ msgstr "%s یک رنگ صحیح نیست!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s یک رنگ صحیح نیست! از Û³ یا Û¶ حر٠مبنای شانزده Ø§Ø³ØªÙØ§Ø¯Ù‡ کنید"
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index e54b94b71..b92edf111 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,17 +10,76 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:10+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:33+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Hyväksy"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Profiilikuva-asetukset"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Rekisteröidy"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Yksityisyys"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "Kutsu"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "Estä"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Tallenna"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Profiilikuva-asetukset"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +94,29 @@ msgstr "Sivua ei ole."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Käyttäjää ei ole."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s ja kaverit, sivu %d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -100,7 +163,7 @@ msgstr ""
"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
"newnotice%%%%?status_textarea=%s)!"
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -111,8 +174,8 @@ msgstr ""
msgid "You and friends"
msgstr "Sinä ja kaverit"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
@@ -122,23 +185,23 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metodia ei löytynyt!"
@@ -153,7 +216,7 @@ msgstr "API-metodia ei löytynyt!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Tämä metodi edellyttää POST sanoman."
@@ -184,8 +247,9 @@ msgstr "Ei voitu tallentaa profiilia."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -306,12 +370,12 @@ msgstr "Et voi lopettaa itsesi tilausta!"
msgid "Two user ids or screen_names must be supplied."
msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Julkista päivitysvirtaa ei saatu."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Ei löytynyt yhtään päivitystä."
@@ -336,7 +400,8 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
msgid "Not a valid nickname."
msgstr "Tuo ei ole kelvollinen tunnus."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -348,7 +413,8 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
msgid "Full name is too long (max 255 chars)."
msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
@@ -384,7 +450,7 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Ryhmää ei löytynyt!"
@@ -425,6 +491,118 @@ msgstr "Käyttäjän %s ryhmät"
msgid "groups on %s"
msgstr "Ryhmän toiminnot"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Koko ei kelpaa."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
+"uudelleen."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Käyttäjätunnus tai salasana ei kelpaa."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Virhe tapahtui käyttäjän asettamisessa."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Odottamaton lomakkeen lähetys."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Käyttäjätili"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Tunnus"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Salasana"
+
+#: actions/apioauthauthorize.php:328
+#, fuzzy
+msgid "Deny"
+msgstr "Ulkoasu"
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Kaikki"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
@@ -456,17 +634,17 @@ msgstr "Päivitys poistettu."
msgid "No status with that ID found."
msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Ei löytynyt"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -480,7 +658,7 @@ msgstr "Formaattia ei ole tuettu."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Käyttäjän %s suosikit"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
@@ -491,7 +669,7 @@ msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
msgid "%s timeline"
msgstr "%s aikajana"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -508,27 +686,22 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s julkinen aikajana"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s päivitykset kaikilta!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Vastaukset käyttäjälle %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Vastaukset käyttäjälle %s"
@@ -538,7 +711,7 @@ msgstr "Vastaukset käyttäjälle %s"
msgid "Notices tagged with %s"
msgstr "Päivitykset joilla on tagi %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
@@ -598,8 +771,8 @@ msgstr "Alkuperäinen"
msgid "Preview"
msgstr "Esikatselu"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Poista"
@@ -611,31 +784,6 @@ msgstr "Lataa"
msgid "Crop"
msgstr "Rajaa"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
-"uudelleen."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Odottamaton lomakkeen lähetys."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
@@ -672,8 +820,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Ei"
@@ -681,13 +830,13 @@ msgstr "Ei"
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Kyllä"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
@@ -771,7 +920,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Ei voitu poistaa sähköpostivahvistusta."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Vahvista osoite"
#: actions/confirmaddress.php:159
@@ -788,10 +938,55 @@ msgstr "Keskustelu"
msgid "Notices"
msgstr "Päivitykset"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr ""
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Päivitykselle ei ole profiilia"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Istuntoavaimesi kanssa oli ongelma."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Päivitystä ei ole."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Älä poista tätä päivitystä"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Poista tämä päivitys"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -822,7 +1017,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
msgid "Do not delete this notice"
msgstr "Älä poista tätä päivitystä"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -959,16 +1154,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Tallenna"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -981,10 +1166,88 @@ msgstr "Tämä päivitys ei ole suosikki!"
msgid "Add to favorites"
msgstr "Lisää suosikkeihin"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Dokumenttia ei ole."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Muita asetuksia"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr ""
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Päivitystä ei ole."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Kuvaus"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Kotisivun verkko-osoite ei ole toimiva."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Ei voitu päivittää ryhmää."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1013,7 +1276,7 @@ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
msgid "Could not update group."
msgstr "Ei voitu päivittää ryhmää."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Ei voitu lisätä aliasta."
@@ -1056,7 +1319,8 @@ msgstr ""
"lisäohjeita. "
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Peruuta"
@@ -1139,7 +1403,7 @@ msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -1151,7 +1415,7 @@ msgstr "Tämä on jo sähköpostiosoitteesi."
msgid "That email address already belongs to another user."
msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Ei voitu asettaa vahvistuskoodia."
@@ -1213,7 +1477,7 @@ msgstr "Tämä päivitys on jo suosikki!"
msgid "Disfavor favorite"
msgstr "Poista suosikeista"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Suosituimmat päivitykset"
@@ -1363,7 +1627,7 @@ msgstr "Käyttäjä on asettanut eston sinulle."
msgid "User is not a member of group."
msgstr "Käyttäjä ei kuulu tähän ryhmään."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Estä käyttäjä ryhmästä"
@@ -1457,23 +1721,23 @@ 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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Ylläpito"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Estä"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Tee tästä käyttäjästä ylläpitäjä"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Tee ylläpitäjäksi"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Tee tästä käyttäjästä ylläpitäjä"
@@ -1649,6 +1913,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Tämä ei ole Jabber ID-tunnuksesi."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Saapuneet viestit käyttäjälle %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1733,7 +2002,7 @@ msgstr "Henkilökohtainen viesti"
msgid "Optionally add a personal message to the invitation."
msgstr "Voit myös lisätä oman viestisi kutsuun"
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Lähetä"
@@ -1833,7 +2102,7 @@ msgstr "Väärä käyttäjätunnus tai salasana"
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -1842,17 +2111,6 @@ msgstr "Kirjaudu sisään"
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Tunnus"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Salasana"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Muista minut"
@@ -1885,21 +2143,21 @@ msgstr ""
"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
"kokeile [OpenID](%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%s on jo ryhmän \"%s\" ylläpitäjä."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s"
@@ -1908,6 +2166,30 @@ msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s"
msgid "No current status"
msgstr "Ei nykyistä tilatietoa"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Päivitystä ei ole."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Ei voitu lisätä aliasta."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Uusi ryhmä"
@@ -2018,6 +2300,52 @@ msgstr "Tönäisy lähetetty"
msgid "Nudge sent!"
msgstr "Tönäisy lähetetty!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr ""
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Muita asetuksia"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Päivitykselle ei ole profiilia"
@@ -2036,8 +2364,8 @@ msgstr "Yhdistä"
msgid "Only "
msgstr "Vain "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -2050,7 +2378,8 @@ msgid "Notice Search"
msgstr "Etsi Päivityksistä"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Muita Asetuksia"
#: actions/othersettings.php:71
@@ -2107,6 +2436,11 @@ msgstr "Päivityksen sisältö ei kelpaa"
msgid "Login token expired."
msgstr "Kirjaudu sisään"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Käyttäjän %s lähetetyt viestit"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2177,7 +2511,7 @@ msgstr "Uutta salasanaa ei voida tallentaa."
msgid "Password saved."
msgstr "Salasana tallennettu."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Polut"
@@ -2185,143 +2519,160 @@ msgstr "Polut"
msgid "Path and server settings for this StatusNet site."
msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Kutsu"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "Palauta"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Palvelun ilmoitus"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Kuva"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Profiilikuva-asetukset"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Kuva päivitetty."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Kuva poistettu."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Taustakuvat"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Taustakuvapalvelin"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Taustakuvan hakemistopolku"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Taustakuvan hakemisto"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Palauta"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Päivitykset"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
#, fuzzy
msgid "Always"
msgstr "Aliakset"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Palauta"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Palvelun ilmoitus"
@@ -2387,7 +2738,7 @@ msgid "Full name"
msgstr "Koko nimi"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Kotisivu"
@@ -2410,7 +2761,7 @@ msgstr "Tietoja"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Kotipaikka"
@@ -2436,7 +2787,7 @@ msgstr ""
"Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
"ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Kieli"
@@ -2464,7 +2815,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Aikavyöhykettä ei ole valittu."
@@ -2477,24 +2828,24 @@ msgstr "Kieli on liian pitkä (max 50 merkkiä)."
msgid "Invalid tag: \"%s\""
msgstr "Virheellinen tagi: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Tageja ei voitu tallentaa."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Ei voitu tallentaa profiilia."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Tageja ei voitu tallentaa."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Asetukset tallennettu."
@@ -2516,36 +2867,36 @@ msgstr "Julkinen aikajana, sivu %d"
msgid "Public timeline"
msgstr "Julkinen aikajana"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Julkinen syöte (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Julkisen Aikajanan Syöte (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Julkinen syöte (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Ole ensimmäinen joka lähettää päivityksen!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2554,7 +2905,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2591,7 +2942,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Tagipilvi"
@@ -2731,7 +3082,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -2773,7 +3124,7 @@ msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Sähköposti"
@@ -2883,7 +3234,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Tilaa"
@@ -2927,7 +3278,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
msgid "You already repeated that notice."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Luotu"
@@ -2943,6 +3294,11 @@ msgstr "Luotu"
msgid "Replies to %s"
msgstr "Vastaukset käyttäjälle %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2988,6 +3344,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Päivitys poistettu."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2998,6 +3359,126 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle."
msgid "User is already sandboxed."
msgstr "Käyttäjä on asettanut eston sinulle."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Profiilikuva-asetukset"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Päivitykselle ei ole profiilia"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Tunnus"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Sivutus"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Kuvaus"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Tilastot"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Käyttäjän %s suosikkipäivitykset"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Ei saatu haettua suosikkipäivityksiä."
@@ -3047,17 +3528,22 @@ msgstr ""
msgid "%s group"
msgstr "Ryhmä %s"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Ryhmän %s jäsenet, sivu %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Ryhmän profiili"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Huomaa"
@@ -3103,10 +3589,6 @@ msgstr "(Tyhjä)"
msgid "All members"
msgstr "Kaikki jäsenet"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Tilastot"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Luotu"
@@ -3163,6 +3645,11 @@ msgstr "Päivitys on poistettu."
msgid " tagged %s"
msgstr "Päivitykset joilla on tagi %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s ja kaverit, sivu %d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3188,20 +3675,20 @@ msgstr "Päivityksien syöte käyttäjälle %s"
msgid "FOAF for %s"
msgstr "Käyttäjän %s lähetetyt viestit"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään "
"päivitystä."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, fuzzy, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3210,7 +3697,7 @@ msgstr ""
"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
"newnotice%%%%?status_textarea=%s)!"
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3219,7 +3706,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3229,7 +3716,7 @@ msgstr ""
"Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
"[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Vastaukset käyttäjälle %s"
@@ -3248,207 +3735,148 @@ msgstr "Käyttäjä on asettanut eston sinulle."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Palvelun ilmoitus"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Paikalliset näkymät"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "Ensisijainen kieli"
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Palauta"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Hyväksy"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Yksityisyys"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Kutsu"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Estä"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Profiilikuva-asetukset"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3555,15 +3983,26 @@ msgstr "Koodia ei ole syötetty."
msgid "You are not subscribed to that profile."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Käyttäjä ei ole rekisteröitynyt tähän palveluun."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Tiedostoa ei ole."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Tilattu"
@@ -3623,7 +4062,7 @@ msgstr "Näiden ihmisten päivityksiä sinä seuraat."
msgid "These are the people whose notices %s listens to."
msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3633,19 +4072,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s ei seuraa ketään käyttäjää."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3675,7 +4119,8 @@ msgstr "Tagi %s"
msgid "User profile"
msgstr "Käyttäjän profiili"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Kuva"
@@ -3739,7 +4184,7 @@ msgstr "Ei profiili id:tä kyselyssä."
msgid "Unsubscribed"
msgstr "Tilaus lopetettu"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3754,91 +4199,71 @@ msgstr "Käyttäjä"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiili"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "Kutsu uusia käyttäjiä"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Kaikki tilaukset"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
"ihmiskäyttäjille)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Kutsu(t) lähetettiin"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "Kutsu(t) lähetettiin"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Valtuuta tilaus"
@@ -3854,37 +4279,37 @@ msgstr ""
"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
"paina \"Peruuta\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Lisenssi"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Hyväksy"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Tilaa tämä käyttäjä"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Hylkää"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Käyttäjän %s tilaukset"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Ei valtuutuspyyntöä!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Tilaus sallittu"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3895,11 +4320,11 @@ msgstr ""
"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
"Tilauskoodisi on:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Tilaus hylätty"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3909,37 +4334,37 @@ msgstr ""
"Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Kuvan '%s' tyyppi on väärä"
@@ -3959,6 +4384,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Ryhmän %s jäsenet, sivu %d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Hae lisää ryhmiä"
@@ -3985,11 +4415,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Päivitys poistettu."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4021,12 +4446,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Tunnus"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Omat"
@@ -4035,10 +4455,6 @@ msgstr "Omat"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Kuvaus"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4089,28 +4505,28 @@ msgstr "Viestin tallennus ei onnistunut."
msgid "Could not update message with new URI."
msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4118,34 +4534,61 @@ msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Käyttäjä on asettanut eston sinulle."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ei ole tilattu!."
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Ei voitu poistaa tilausta."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Ei voitu poistaa tilausta."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Ryhmän luonti ei onnistunut."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
@@ -4187,131 +4630,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Nimetön sivu"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Koti"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Käyttäjätili"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Yhdistä"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Kutsu"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ohjeet"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Haku"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Palvelun ilmoitus"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Paikalliset näkymät"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Sivuilmoitus"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Tietoa"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "UKK"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Yksityisyys"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Lähdekoodi"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:745
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4320,12 +4759,12 @@ msgstr ""
"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** on mikroblogipalvelu. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4336,34 +4775,56 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Aiemmin"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Istuntoavaimesi kanssa oli ongelma."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4400,11 +4861,105 @@ msgstr "Sähköpostiosoitteen vahvistus"
msgid "Design configuration"
msgstr "SMS vahvistus"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS vahvistus"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS vahvistus"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS vahvistus"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS vahvistus"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Lähdekoodi"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Poista"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4426,12 +4981,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Salasanan vaihto"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Salasanan vaihto"
@@ -4585,83 +5140,92 @@ msgstr "Ongelma päivityksen tallentamisessa."
msgid "Specify the name of the user to subscribe to"
msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Käyttäjää ei ole."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Käyttäjän %s päivitykset tilattu"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Komentoa ei ole vielä toteutettu."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Ilmoitukset pois päältä."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Ilmoituksia ei voi pistää pois päältä."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Ilmoitukset päällä."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sinä et kuulu tähän ryhmään."
msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4675,6 +5239,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4702,20 +5267,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Varmistuskoodia ei ole annettu."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -4732,6 +5297,15 @@ msgstr "Päivitykset pikaviestintä käyttäen (IM)"
msgid "Updates by SMS"
msgstr "Päivitykset SMS:llä"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Yhdistä"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Tietokantavirhe"
@@ -4921,12 +5495,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5141,7 +5715,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " lähteestä "
@@ -5260,60 +5834,56 @@ msgid "Do not share my location"
msgstr "Tageja ei voitu tallentaa."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Ei"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Ei sisältöä!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Luotu"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Vastaa tähän päivitykseen"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Vastaus"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Päivitys on poistettu."
@@ -5347,12 +5917,7 @@ msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
msgid "Duplicate notice"
msgstr "Poista päivitys"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Ei voitu lisätä uutta tilausta."
@@ -5368,19 +5933,19 @@ msgstr "Vastaukset"
msgid "Favorites"
msgstr "Suosikit"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Saapuneet"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Sinulle saapuneet viestit"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Lähetetyt"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Lähettämäsi viestit"
@@ -5462,6 +6027,10 @@ msgstr "Vastaa tähän päivitykseen"
msgid "Repeat this notice"
msgstr "Vastaa tähän päivitykseen"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5535,36 +6104,6 @@ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
msgid "Groups %s is a member of"
msgstr "Ryhmät, joiden jäsen %s on"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Käyttäjä on asettanut eston sinulle."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Ei voitu tilata."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Toista ei voitu asettaa tilaamaan sinua."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ei ole tilattu!."
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Ei voitu poistaa tilausta."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Ei voitu poistaa tilausta."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5618,68 +6157,68 @@ msgstr "Kuva"
msgid "User actions"
msgstr "Käyttäjän toiminnot"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Profiiliasetukset"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Lähetä suora viesti tälle käyttäjälle"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Viesti"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "noin vuosi sitten"
@@ -5693,7 +6232,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 917a67ffc..cf0cc849b 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,8 +1,10 @@
# Translation of StatusNet to French
#
+# Author@translatewiki.net: Crochet.david
# Author@translatewiki.net: IAlex
# Author@translatewiki.net: Isoph
# Author@translatewiki.net: Jean-Frédéric
+# Author@translatewiki.net: Julien C
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Peter17
# --
@@ -12,17 +14,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:16+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:48+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Accès"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Paramètres d’accès au site"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Inscription"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privé"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Interdire aux utilisateurs anonymes (non connectés) de voir le site ?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Sur invitation uniquement"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Autoriser l’inscription sur invitation seulement."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Fermé"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Désactiver les nouvelles inscriptions."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Enregistrer"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Sauvegarder les paramètres d’accès"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -37,25 +91,29 @@ msgstr "Page non trouvée"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Utilisateur non trouvé."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s et ses amis, page %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -103,7 +161,7 @@ msgstr ""
"profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -116,8 +174,8 @@ msgstr ""
msgid "You and friends"
msgstr "Vous et vos amis"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Statuts de %1$s et ses amis dans %2$s!"
@@ -127,23 +185,23 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Méthode API non trouvée !"
@@ -157,7 +215,7 @@ msgstr "Méthode API non trouvée !"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Ce processus requiert un POST."
@@ -188,8 +246,9 @@ msgstr "Impossible d’enregistrer le profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -307,11 +366,11 @@ msgstr "Vous ne pouvez pas ne plus vous suivre vous-même."
msgid "Two user ids or screen_names must be supplied."
msgstr "Vous devez fournir 2 identifiants ou pseudos."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Impossible de déterminer l’utilisateur source."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Impossible de trouver l’utilisateur cible."
@@ -335,7 +394,8 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
msgid "Not a valid nickname."
msgstr "Pseudo invalide."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -347,7 +407,8 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. "
msgid "Full name is too long (max 255 chars)."
msgstr "Nom complet trop long (maximum de 255 caractères)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La description est trop longue (%d caractères maximum)."
@@ -383,7 +444,7 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Groupe non trouvé !"
@@ -402,7 +463,7 @@ msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
-msgstr "Vous n'êtes pas membre de ce groupe."
+msgstr "Vous n’êtes pas membre de ce groupe."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
#, php-format
@@ -424,6 +485,122 @@ msgstr "Groupes de %s"
msgid "groups on %s"
msgstr "groupes sur %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Paramètre oauth_token non fourni."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Jeton incorrect."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Pseudo ou mot de passe incorrect !"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+"Erreur de la base de données lors de la suppression de l’utilisateur de "
+"l’application OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Le jeton de connexion %s a été autorisé. Merci de l’échanger contre un jeton "
+"d’accès."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Le jeton de connexion %s a été refusé et révoqué."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Soumission de formulaire inattendue."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+"Une application vous demande l’autorisation de se connecter à votre compte"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Autoriser ou refuser l’accès"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"L’application <strong>%1$s</strong> de <strong>%2$s</strong> voudrait "
+"pouvoir <strong>%3$s</strong> les données de votre compte %4$s. Vous ne "
+"devriez donner l’accès à votre compte %4$s qu’aux tiers à qui vous faites "
+"confiance."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Compte"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Pseudo"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Mot de passe"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Refuser"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Autoriser"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Autoriser ou refuser l’accès à votre compte."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Ce processus requiert un POST ou un DELETE."
@@ -453,17 +630,17 @@ msgstr "Statut supprimé."
msgid "No status with that ID found."
msgstr "Aucun statut trouvé avec cet identifiant."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Non trouvé"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -479,7 +656,7 @@ msgstr "Format non supporté."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoris de %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s statuts favoris de %2$s / %2$s."
@@ -490,7 +667,7 @@ msgstr "%1$s statuts favoris de %2$s / %2$s."
msgid "%s timeline"
msgstr "Activité de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -506,27 +683,22 @@ msgstr "%1$s / Mises à jour mentionnant %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Activité publique %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statuts de tout le monde !"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Repris par %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Repris pour %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Reprises de %s"
@@ -536,7 +708,7 @@ msgstr "Reprises de %s"
msgid "Notices tagged with %s"
msgstr "Avis marqués avec %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mises à jour marquées avec %1$s dans %2$s !"
@@ -598,8 +770,8 @@ msgstr "Image originale"
msgid "Preview"
msgstr "Aperçu"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Supprimer"
@@ -611,31 +783,6 @@ msgstr "Transfert"
msgid "Crop"
msgstr "Recadrer"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
-"nouveau."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Soumission de formulaire inattendue."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
@@ -670,12 +817,13 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-"Êtes-vous certain de vouloir bloquer cet utilisateur ? Après cela, il ne "
-"sera plus abonné à votre compte, ne pourra plus s’y abonner de nouveau, et "
-"vous ne serez pas informé des @-réponses de sa part."
+"Voulez-vous vraiment bloquer cet utilisateur ? Après cela, il ne sera plus "
+"abonné à votre compte, ne pourra plus s’y abonner de nouveau, et vous ne "
+"serez pas informé des @-réponses de sa part."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Non"
@@ -683,13 +831,13 @@ msgstr "Non"
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Oui"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
@@ -772,7 +920,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Impossible de supprimer le courriel de confirmation."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Confirmer l’adresse"
#: actions/confirmaddress.php:159
@@ -789,10 +937,51 @@ msgstr "Conversation"
msgid "Notices"
msgstr "Avis"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Vous devez être connecté pour supprimer une application."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Application non trouvée."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Vous n’êtes pas le propriétaire de cette application."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Un problème est survenu avec votre jeton de session."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Supprimer l’application"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Voulez-vous vraiment supprimer cette application ? Ceci effacera toutes les "
+"données à son propos de la base de données, y compris toutes les connexions "
+"utilisateur existantes."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Ne pas supprimer cette application"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Supprimer cette application"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -817,13 +1006,13 @@ msgstr "Supprimer cet avis"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
-msgstr "Êtes-vous sûr(e) de vouloir supprimer cet avis ?"
+msgstr "Voulez-vous vraiment supprimer cet avis ?"
#: actions/deletenotice.php:145
msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Supprimer cet avis"
@@ -837,15 +1026,15 @@ msgstr "Vous pouvez seulement supprimer les utilisateurs locaux."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
-msgstr "Supprimer l'utilsateur"
+msgstr "Supprimer l’utilisateur"
#: actions/deleteuser.php:135
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
-"Êtes-vous certain de vouloir supprimer cet utilisateur ? Ceci effacera "
-"toutes les données à son propos de la base de données, sans sauvegarde."
+"Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les "
+"données à son propos de la base de données, sans sauvegarde."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
msgid "Delete this user"
@@ -867,7 +1056,7 @@ msgstr "URL du logo invalide."
#: actions/designadminpanel.php:279
#, php-format
msgid "Theme not available: %s"
-msgstr "Le thème n'est pas disponible : %s"
+msgstr "Le thème n’est pas disponible : %s"
#: actions/designadminpanel.php:375
msgid "Change logo"
@@ -904,7 +1093,7 @@ msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-"Vous pouvez importer une image d'arrière plan pour ce site. La taille "
+"Vous pouvez importer une image d’arrière plan pour ce site. La taille "
"maximale du fichier est de %1$s."
#: actions/designadminpanel.php:457 lib/designsettings.php:139
@@ -955,16 +1144,6 @@ msgstr "Restaurer les conceptions par défaut"
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Enregistrer"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Sauvegarder la conception"
@@ -977,9 +1156,75 @@ msgstr "Cet avis n’est pas un favori !"
msgid "Add to favorites"
msgstr "Ajouter aux favoris"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Document non trouvé."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Document « %s » non trouvé."
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Modifier l’application"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Vous devez être connecté pour modifier une application."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Application non trouvée."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Utilisez ce formulaire pour modifier votre application."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Le nom est requis."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Le nom est trop long (maximum de 255 caractères)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Ce nom est déjà utilisé. Essayez-en un autre."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "La description est requise."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "L’URL source est trop longue."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "L’URL source est invalide."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "L’organisation est requise."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "L’organisation est trop longue (maximum de 255 caractères)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "La page d’accueil de l’organisation est requise."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Le rappel (Callback) est trop long."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "L’URL de rappel (Callback) est invalide."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Impossible de mettre à jour l’application."
#: actions/editgroup.php:56
#, php-format
@@ -1008,7 +1253,7 @@ msgstr "la description est trop longue (%d caractères maximum)."
msgid "Could not update group."
msgstr "Impossible de mettre à jour le groupe."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Impossible de créer les alias."
@@ -1049,7 +1294,8 @@ msgstr ""
"réception (et celle de spam !) pour recevoir de nouvelles instructions."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Annuler"
@@ -1131,7 +1377,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
@@ -1143,7 +1389,7 @@ msgstr "Vous utilisez déjà cette adresse courriel."
msgid "That email address already belongs to another user."
msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Impossible d’insérer le code de confirmation."
@@ -1204,7 +1450,7 @@ msgstr "Cet avis a déjà été ajouté à vos favoris !"
msgid "Disfavor favorite"
msgstr "Retirer ce favori"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Avis populaires"
@@ -1301,7 +1547,7 @@ msgstr "Cet utilisateur vous a empêché de vous inscrire."
#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
-msgstr "Vous n'êtes pas autorisé."
+msgstr "Vous n’êtes pas autorisé."
#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
@@ -1352,7 +1598,7 @@ msgstr "Cet utilisateur est déjà bloqué pour le groupe."
msgid "User is not a member of group."
msgstr "L’utilisateur n’est pas membre du groupe."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Bloquer cet utilisateur du groupe"
@@ -1451,23 +1697,23 @@ msgstr "Membres du groupe %1$s - page %2$d"
msgid "A list of the users in this group."
msgstr "Liste des utilisateurs inscrits à ce groupe."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrer"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Bloquer"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Faire de cet utilisateur un administrateur du groupe"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Faire un administrateur"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Faire de cet utilisateur un administrateur"
@@ -1653,6 +1899,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Ceci n’est pas votre identifiant Jabber."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Boîte de réception de %1$s - page %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1737,7 +1988,7 @@ msgstr "Message personnel"
msgid "Optionally add a personal message to the invitation."
msgstr "Ajouter un message personnel à l’invitation (optionnel)."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Envoyer"
@@ -1820,7 +2071,7 @@ msgstr "Vous devez ouvrir une session pour quitter un groupe."
#: actions/leavegroup.php:90 lib/command.php:265
msgid "You are not a member of that group."
-msgstr "Vous n'êtes pas membre de ce groupe."
+msgstr "Vous n’êtes pas membre de ce groupe."
#: actions/leavegroup.php:127
#, php-format
@@ -1841,7 +2092,7 @@ msgstr ""
"Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
"pas autorisé."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
@@ -1850,17 +2101,6 @@ msgstr "Ouvrir une session"
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Pseudo"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Mot de passe"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Se souvenir de moi"
@@ -1893,24 +2133,24 @@ msgstr ""
"pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau "
"compte."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
"Seul un administrateur peut faire d’un autre utilisateur un administrateur."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s est déjà administrateur du groupe « %2$s »."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr ""
"Impossible d’obtenir les enregistrements d’appartenance pour %1$s dans le "
"groupe %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Impossible de rendre %1$s administrateur du groupe %2$s."
@@ -1919,6 +2159,26 @@ msgstr "Impossible de rendre %1$s administrateur du groupe %2$s."
msgid "No current status"
msgstr "Aucun statut actuel"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nouvelle application"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Vous devez être connecté pour enregistrer une application."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Utilisez ce formulaire pour inscrire une nouvelle application."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "L’URL source est requise."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Impossible de créer l’application."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nouveau groupe"
@@ -2033,6 +2293,51 @@ msgstr "Clin d’œil envoyé"
msgid "Nudge sent!"
msgstr "Clin d’œil envoyé !"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Vous devez être connecté pour lister vos applications."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Applications OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Applications que vous avez enregistré"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Vous n’avez encore enregistré aucune application."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Applications connectées."
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+"Vous avez autorisé les applications suivantes à accéder à votre compte."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Vous n’êtes pas un utilisateur de cette application."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Impossible d’annuler l’accès de l’application : "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Vous n’avez autorisé aucune application à utiliser votre compte."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Les programmeurs peuvent modifier les paramètres d’enregistrement pour leurs "
+"applications "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "L’avis n’a pas de profil"
@@ -2050,8 +2355,8 @@ msgstr "type de contenu "
msgid "Only "
msgstr "Seulement "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -2064,7 +2369,7 @@ msgid "Notice Search"
msgstr "Recherche d’avis"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Autres paramètres"
#: actions/othersettings.php:71
@@ -2097,23 +2402,28 @@ msgstr "Le service de réduction d’URL est trop long (50 caractères maximum).
#: actions/otp.php:69
msgid "No user ID specified."
-msgstr "Aucun identifiant d'utilisateur n’a été spécifié."
+msgstr "Aucun identifiant d’utilisateur n’a été spécifié."
#: actions/otp.php:83
msgid "No login token specified."
-msgstr "Aucun jeton d'identification n’a été spécifié."
+msgstr "Aucun jeton d’identification n’a été spécifié."
#: actions/otp.php:90
msgid "No login token requested."
-msgstr "Aucune jeton d'identification requis."
+msgstr "Aucun jeton d’identification n’a été demandé."
#: actions/otp.php:95
msgid "Invalid login token specified."
-msgstr "Jeton d'identification invalide."
+msgstr "Jeton d’identification invalide."
#: actions/otp.php:104
msgid "Login token expired."
-msgstr "Jeton d'identification périmé."
+msgstr "Jeton d’identification périmé."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Boîte d’envoi de %1$s - page %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2186,7 +2496,7 @@ msgstr "Impossible de sauvegarder le nouveau mot de passe."
msgid "Password saved."
msgstr "Mot de passe enregistré."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Chemins"
@@ -2194,132 +2504,148 @@ msgstr "Chemins"
msgid "Path and server settings for this StatusNet site."
msgstr "Paramètres de chemin et serveur pour ce site StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Dossier des thème non lisible : %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Dossier des avatars non inscriptible : %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Dossier des arrière plans non inscriptible : %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Dossier des paramètres régionaux non lisible : %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Serveur"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Nom d’hôte du serveur du site."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Chemin"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Chemin du site"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Chemin vers les paramètres régionaux"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Chemin de dossier vers les paramètres régionaux"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Jolies URL"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Utiliser des jolies URL (plus lisibles et faciles à mémoriser) ?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Thème"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Serveur de thèmes"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Chemin des thèmes"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Dossier des thèmes"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Serveur d’avatar"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Chemin des avatars"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Dossier des avatars"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Arrière plans"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Serveur des arrière plans"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Chemin des arrière plans"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Dossier des arrière plans"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Jamais"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Quelquefois"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Toujours"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Utiliser SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Quand utiliser SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "Serveur SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Serveur vers lequel rediriger les requêtes SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Enregistrer les chemins."
@@ -2384,7 +2710,7 @@ msgid "Full name"
msgstr "Nom complet"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site personnel"
@@ -2407,7 +2733,7 @@ msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Emplacement"
@@ -2433,7 +2759,7 @@ msgstr ""
"Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
"virgules ou des espaces"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Langue"
@@ -2461,7 +2787,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Aucun fuseau horaire n’a été choisi."
@@ -2474,23 +2800,23 @@ msgstr "La langue est trop longue (255 caractères maximum)."
msgid "Invalid tag: \"%s\""
msgstr "Marque invalide : « %s »"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Impossible de mettre à jour l’auto-abonnement."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Impossible d’enregistrer les préférences de localisation."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Impossible d’enregistrer le profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Impossible d’enregistrer les marques."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Préférences enregistrées."
@@ -2512,19 +2838,19 @@ msgstr "Flux public - page %d"
msgid "Public timeline"
msgstr "Flux public"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Fil du flux public (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Fil du flux public (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Fil du flux public (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2533,11 +2859,11 @@ msgstr ""
"Ceci est la chronologie publique de %%site.name%% mais personne n’a encore "
"rien posté."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Soyez le premier à poster !"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2545,7 +2871,7 @@ msgstr ""
"Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
"poster !"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2559,7 +2885,7 @@ msgstr ""
"vous avec vos amis, famille et collègues ! ([Plus d’informations](%%doc.help%"
"%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2597,7 +2923,7 @@ msgstr ""
"Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
"en poster un !"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Nuage de marques"
@@ -2741,7 +3067,7 @@ msgstr "Désolé, code d’invitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -2784,7 +3110,7 @@ msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Courriel"
@@ -2893,7 +3219,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "S’abonner"
@@ -2930,7 +3256,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
msgid "You already repeated that notice."
msgstr "Vous avez déjà repris cet avis."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repris"
@@ -2944,6 +3270,11 @@ msgstr "Repris !"
msgid "Replies to %s"
msgstr "Réponses à %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Réponses à %1$s, page %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2993,6 +3324,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Réponses à %1$s sur %2$s !"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -3002,6 +3337,121 @@ msgstr ""
msgid "User is already sandboxed."
msgstr "L’utilisateur est déjà dans le bac à sable."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessions"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Paramètres de session pour ce site StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gérer les sessions"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "S’il faut gérer les sessions nous-même."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Déboguage de session"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Activer la sortie de déboguage pour les sessions."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Sauvegarder les paramètres du site"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Vous devez être connecté pour voir une application."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Profil de l’application"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Icône"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nom"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organisation"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Description"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Créé par %1$s - accès %2$s par défaut - %3$d utilisateurs"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Actions de l’application"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Réinitialiser la clé et le secret"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Informations sur l’application"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Clé de l’utilisateur"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Secret de l’utilisateur"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL du jeton de requête"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL du jeton d’accès"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Autoriser l’URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Note : Nous utilisons les signatures HMAC-SHA1. Nous n’utilisons pas la "
+"méthode de signature en texte clair."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Voulez-vous vraiment réinitialiser votre clé consommateur et secrète ?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Avis favoris de %1$s, page %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Impossible d’afficher les favoris."
@@ -3059,17 +3509,22 @@ msgstr "C’est un moyen de partager ce que vous aimez."
msgid "%s group"
msgstr "Groupe %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Groupe %1$s, page %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Profil du groupe"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Note"
@@ -3115,10 +3570,6 @@ msgstr "(aucun)"
msgid "All members"
msgstr "Tous les membres"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistiques"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Créé"
@@ -3185,6 +3636,11 @@ msgstr "Avis supprimé."
msgid " tagged %s"
msgstr " marqué %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, page %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3210,13 +3666,13 @@ msgstr "Flux des avis de %s (Atom)"
msgid "FOAF for %s"
msgstr "ami d’un ami pour %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"Ceci est la chronologie de %1$s mais %2$s n’a rien publié pour le moment."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3224,7 +3680,7 @@ msgstr ""
"Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié "
"d’avis pour le moment, vous pourriez commencer maintenant :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3233,7 +3689,7 @@ msgstr ""
"Vous pouvez essayer de faire un clin d’œil à %1$s ou de [poster quelque "
"chose à son intention](%%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3247,7 +3703,7 @@ msgstr ""
"register%%%%) pour suivre les avis de **%s** et bien plus ! ([En lire plus](%"
"%%%doc.help%%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3258,7 +3714,7 @@ msgstr ""
"wikipedia.org/wiki/Microblog) basé sur le logiciel libre [StatusNet](http://"
"status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Reprises de %s"
@@ -3275,197 +3731,145 @@ msgstr "Cet utilisateur est déjà réduit au silence."
msgid "Basic settings for this StatusNet site."
msgstr "Paramètres basiques pour ce site StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Le nom du site ne peut pas être vide."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Vous devez avoir une adresse électronique de contact valide."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "Langue « %s » inconnue."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "URL de rapport d’instantanés invalide."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Valeur de lancement d’instantanés invalide."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "La fréquence des instantanés doit être un nombre."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "La limite minimale de texte est de 140 caractères."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "La limite de doublon doit être d’une seconde ou plus."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Général"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Nom du site"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Le nom de votre site, comme « Microblog de votre compagnie »"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Apporté par"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Texte utilisé pour le lien de crédits au bas de chaque page"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "Apporté par URL"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL utilisée pour le lien de crédits au bas de chaque page"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Adresse de courriel de contact de votre site"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Local"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Zone horaire par défaut"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Zone horaire par défaut pour ce site ; généralement UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Langue du site par défaut"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Serveur"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Nom d’hôte du serveur du site."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Jolies URL"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Utiliser des jolies URL (plus lisibles et mémorable) ?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Accès"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Privé"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Interdire aux utilisateurs anonymes (non connectés) de voir le site ?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Sur invitation uniquement"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Rendre l’inscription sur invitation seulement."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Fermé"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Désactiver les nouvelles inscriptions."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Instantanés"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Au hasard lors des requêtes web"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Dans une tâche programée"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Instantanés de données"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Quand envoyer des données statistiques aux serveurs status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Fréquence"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Les instantanés seront envoyés une fois tous les N requêtes"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL de rapport"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Les instantanés seront envoyés à cette URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limites"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Limite de texte"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Nombre maximal de caractères pour les avis."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Limite de doublons"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Combien de temps (en secondes) les utilisateurs doivent attendre pour poster "
"la même chose de nouveau."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Sauvegarder les paramètres du site"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "Paramètres SMS"
@@ -3571,17 +3975,28 @@ msgstr "Aucun code entré"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
-msgstr "Vous n'êtes pas abonné(e) à ce profil."
+msgstr "Vous n’êtes pas abonné(e) à ce profil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Impossible d’enregistrer l’abonnement."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ceci n’est pas un utilisateur local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Fichier non trouvé."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Vous n’êtes pas abonné(e) à ce profil."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonné"
@@ -3645,7 +4060,7 @@ msgstr "Vous suivez les avis de ces personnes."
msgid "These are the people whose notices %s listens to."
msgstr "Les avis de ces personnes sont suivis par %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3661,19 +4076,24 @@ msgstr ""
"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez "
"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là-bas."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s ne suit actuellement personne."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Avis marqués avec %1$s, page %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3702,7 +4122,8 @@ msgstr "Marque %s"
msgid "User profile"
msgstr "Profil de l’utilisateur"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Photo"
@@ -3762,7 +4183,7 @@ msgstr "Aucune identité de profil dans la requête."
msgid "Unsubscribed"
msgstr "Désabonné"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3779,86 +4200,66 @@ msgstr "Utilisateur"
msgid "User settings for this StatusNet site."
msgstr "Paramètres des utilisateurs pour ce site StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite de bio invalide : doit être numérique."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Limite de bio"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Longueur maximale de la bio d’un profil en caractères."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nouveaux utilisateurs"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Accueil des nouveaux utilisateurs"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
"Texte de bienvenue pour les nouveaux utilisateurs (maximum 255 caractères)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Abonnements par défaut"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Abonner automatiquement les nouveaux utilisateurs à cet utilisateur."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Invitations"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Invitations activées"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
"S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessions"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Gérer les sessions"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "S’il faut gérer les sessions nous-même."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Déboguage de session"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Activer la sortie de déboguage pour les sessions."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser l’abonnement"
@@ -3873,36 +4274,36 @@ msgstr ""
"abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous "
"abonner aux avis de quelqu’un, cliquez « Rejeter »."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licence"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Accepter"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "S’abonner à cet utilisateur"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Refuser"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Rejeter cet abonnement"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Pas de requête d’autorisation !"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Abonnement autorisé"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3912,11 +4313,11 @@ msgstr ""
"Vérifiez les instructions du site pour savoir comment compléter "
"l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Abonnement refusé"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3926,38 +4327,38 @@ msgstr ""
"Vérifiez les instructions du site pour savoir comment refuser pleinement "
"l’abonnement."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
"L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est un utilisateur local."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Impossible de lire l’URL de l’avatar « %s »."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
@@ -3978,6 +4379,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Bon appétit !"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Groupes %1$s, page %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Rechercher pour plus de groupes"
@@ -4008,10 +4414,6 @@ msgstr ""
"Ce site est propulsé par %1$s, version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. et ses contributeurs."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Contributeurs"
@@ -4053,11 +4455,7 @@ msgstr ""
msgid "Plugins"
msgstr "Extensions"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nom"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Version"
@@ -4065,10 +4463,6 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Auteur(s)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Description"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4089,24 +4483,21 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Profil du groupe"
+msgstr "L’inscription au groupe a échoué."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Impossible de mettre à jour le groupe."
+msgstr "N’appartient pas au groupe."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Profil du groupe"
+msgstr "La désinscription du groupe a échoué."
#: classes/Login_token.php:76
#, php-format
msgid "Could not create login token for %s"
-msgstr "Impossible de créer le jeton d'ouverture de session pour %s"
+msgstr "Impossible de créer le jeton d’identification pour %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4120,27 +4511,27 @@ msgstr "Impossible d’insérer le message."
msgid "Could not update message with new URI."
msgstr "Impossible de mettre à jour le message avec un nouvel URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques "
"minutes."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4148,36 +4539,59 @@ msgstr ""
"Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
"dans quelques minutes."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Il vous est interdit de poster des avis sur ce site."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erreur de base de donnée en insérant la réponse :%s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Il vous avez été interdit de vous abonner."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Déjà abonné !"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Cet utilisateur vous a bloqué."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Pas abonné !"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Impossible de supprimer l’abonnement à soi-même."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Impossible de cesser l’abonnement"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenue à %1$s, @%2$s !"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Impossible de créer le groupe."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
-msgstr "Impossible d'établir l’inscription au groupe."
+msgstr "Impossible d’établir l’inscription au groupe."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4205,7 +4619,7 @@ msgstr "Autres "
#: lib/accountsettingsaction.php:128
msgid "Other options"
-msgstr "Autres options "
+msgstr "Autres options"
#: lib/action.php:144
#, php-format
@@ -4216,128 +4630,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Page sans nom"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Accueil"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Compte"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre courriel, avatar, mot de passe, profil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Connecter"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Se connecter aux services"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Inviter"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Fermeture de session"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Fermer la session"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Créer un compte"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Aide"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Rechercher"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Notice du site"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Vues locales"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Avis de la page"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "À propos"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "CGU"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Confidentialité"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Source"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Insigne"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4346,12 +4756,12 @@ msgstr ""
"**%%site.name%%** est un service de microblogging qui vous est proposé par "
"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** est un service de micro-blogging."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4362,33 +4772,59 @@ msgstr ""
"version %s, disponible sous la licence [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"Le contenu et les données sont sous le droit d’auteur de %1$s. Tous droits "
+"réservés."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
+"droits réservés."
+
+#: lib/action.php:827
msgid "All "
msgstr "Tous "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licence."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Après"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Avant"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Un problème est survenu avec votre jeton de session."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4418,10 +4854,102 @@ msgstr "Configuration basique du site"
msgid "Design configuration"
msgstr "Configuration de la conception"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Configuration utilisateur"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Configuration d’accès"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Configuration des chemins"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Configuration des sessions"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"La ressource de l’API a besoin de l’accès en lecture et en écriture, mais "
+"vous n’y avez accès qu’en lecture."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"L’essai d’authentification de l’API a échoué ; pseudo = %1$s, proxy = %2$s, "
+"ip = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Modifier votre application"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Icône pour cette application"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Décrivez votre application en %d caractères"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Décrivez votre application"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL source"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL de la page d’accueil de cette application"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organisation responsable de cette application"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL de la page d’accueil de l’organisation"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL vers laquelle rediriger après l’authentification"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Navigateur"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Bureau"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Type d’application, navigateur ou bureau"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Lecture seule"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Lecture-écriture"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Accès par défaut pour cette application : en lecture seule ou en lecture-"
+"écriture"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Révoquer"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Pièces jointes"
@@ -4442,11 +4970,11 @@ msgstr "Avis sur lesquels cette pièce jointe apparaît."
msgid "Tags for this attachment"
msgstr "Marques de cette pièce jointe"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "La modification du mot de passe a échoué"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "La modification du mot de passe n’est pas autorisée"
@@ -4478,7 +5006,7 @@ msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
#: lib/command.php:99
#, php-format
msgid "Nudge sent to %s"
-msgstr "Coup de code envoyé à %s"
+msgstr "Clin d’œil envoyé à %s"
#: lib/command.php:126
#, php-format
@@ -4516,7 +5044,7 @@ msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s"
#: lib/command.php:236
#, php-format
msgid "%s joined group %s"
-msgstr "%1$s a rejoint le groupe %2$s"
+msgstr "%s a rejoint le groupe %s"
#: lib/command.php:275
#, php-format
@@ -4526,7 +5054,7 @@ msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
#: lib/command.php:280
#, php-format
msgid "%s left group %s"
-msgstr "%1$s a quitté le groupe %2$s"
+msgstr "%s a quitté le groupe %s"
#: lib/command.php:309
#, php-format
@@ -4601,82 +5129,92 @@ msgstr "Problème lors de l’enregistrement de l’avis."
msgid "Specify the name of the user to subscribe to"
msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Utilisateur non trouvé."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Abonné à %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Désabonné de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Cette commande n’a pas encore été implémentée."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Avertissements désactivés."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Impossible de désactiver les avertissements."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Avertissements activés."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
-msgstr "La commande d'ouverture de session est désactivée"
+msgstr "La commande d’ouverture de session est désactivée"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
"pendant 2 minutes : %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Désabonné de %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
-msgstr "Vous n'êtes pas abonné(e) à personne."
+msgstr "Vous n’êtes abonné(e) à personne."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vous êtes abonné à cette personne :"
msgstr[1] "Vous êtes abonné à ces personnes :"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Personne ne s’est abonné à vous."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Cette personne est abonnée à vous :"
msgstr[1] "Ces personnes sont abonnées à vous :"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Vous n’êtes membre d’aucun groupe."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vous êtes membre de ce groupe :"
msgstr[1] "Vous êtes membre de ces groupes :"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4690,6 +5228,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4755,20 +5294,20 @@ msgstr ""
"tracks - pas encore implémenté.\n"
"tracking - pas encore implémenté.\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Aucun fichier de configuration n’a été trouvé. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -4784,6 +5323,14 @@ msgstr "Suivi des avis par messagerie instantanée"
msgid "Updates by SMS"
msgstr "Suivi des avis par SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Connexions"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Applications autorisées connectées"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Erreur de la base de données"
@@ -4924,7 +5471,7 @@ msgstr "Groupes avec le plus de membres"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr "Groupes avec le plus d'éléments publiés"
+msgstr "Groupes avec le plus d’éléments publiés"
#: lib/grouptagcloudsection.php:56
#, php-format
@@ -4973,15 +5520,15 @@ msgstr "Mo"
msgid "kB"
msgstr "Ko"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Langue « %s » inconnue."
+msgstr "Source %d inconnue pour la boîte de réception."
#: lib/joinform.php:114
msgid "Join"
@@ -5259,7 +5806,7 @@ msgstr ""
"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
"vous envoyer des messages destinés à vous seul(e)."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5312,7 +5859,7 @@ msgstr "Un dossier temporaire est manquant."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr "Impossible d'écrire sur le disque."
+msgstr "Impossible d’écrire sur le disque."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
@@ -5378,57 +5925,55 @@ msgid "Do not share my location"
msgstr "Ne pas partager ma localisation"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Masquer cette info"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Désolé, l’obtention de votre localisation prend plus de temps que prévu. "
+"Veuillez réessayer plus tard."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "chez"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "dans le contexte"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repris par"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Répondre à cet avis"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Répondre"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Avis repris"
@@ -5460,11 +6005,7 @@ msgstr "Erreur lors de l’insertion du profil distant"
msgid "Duplicate notice"
msgstr "Dupliquer l’avis"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Il vous avez été interdit de vous abonner."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Impossible d’insérer un nouvel abonnement."
@@ -5480,19 +6021,19 @@ msgstr "Réponses"
msgid "Favorites"
msgstr "Favoris"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Boîte de réception"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Vos messages reçus"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Boîte d’envoi"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Vos messages envoyés"
@@ -5569,6 +6110,10 @@ msgstr "Reprendre cet avis ?"
msgid "Repeat this notice"
msgstr "Reprendre cet avis"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Bac à sable"
@@ -5636,34 +6181,6 @@ msgstr "Abonnés de %s"
msgid "Groups %s is a member of"
msgstr "Groupes de %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Déjà abonné !"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Cet utilisateur vous a bloqué."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Impossible de s’abonner."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Impossible d’abonner une autre personne à votre profil."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Pas abonné !"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Impossible de supprimer l’abonnement à soi-même."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Impossible de cesser l’abonnement"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5714,67 +6231,67 @@ msgstr "Modifier l’avatar"
msgid "User actions"
msgstr "Actions de l’utilisateur"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Modifier les paramètres du profil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Modifier"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Envoyer un message à cet utilisateur"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modérer"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -5789,7 +6306,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 4dc2de67a..b60553d44 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,18 +8,77 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:19+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:51+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
"4;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Aceptar"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Configuracións de Twitter"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Rexistrar"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Privacidade"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "Invitar"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Gardar"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Configuracións de Twitter"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -35,25 +94,29 @@ msgstr "Non existe a etiqueta."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ningún usuario."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s e amigos"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -94,7 +157,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -106,8 +169,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s e amigos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións dende %1$s e amigos en %2$s!"
@@ -117,23 +180,23 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Método da API non atopado"
@@ -148,7 +211,7 @@ msgstr "Método da API non atopado"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método require un POST."
@@ -179,8 +242,9 @@ msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -305,12 +369,12 @@ msgstr ""
"Dous identificadores de usuario ou nomes_en_pantalla deben ser "
"proporcionados."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Non se pudo recuperar a liña de tempo publica."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Non se puido atopar ningún estado"
@@ -333,7 +397,8 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
msgid "Not a valid nickname."
msgstr "Non é un alcume válido."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -345,7 +410,8 @@ msgstr "A páxina persoal semella que non é unha URL válida."
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é demasiado longo (max 255 car)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
@@ -381,7 +447,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Método da API non atopado"
@@ -423,6 +489,116 @@ msgstr ""
msgid "groups on %s"
msgstr "Outras opcions"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Tamaño inválido."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Usuario ou contrasinal inválidos."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Acounteceu un erro configurando o usuario."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Erro ó inserir o hashtag na BD: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Envio de formulario non esperada."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Alcume"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contrasinal"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Todos"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Este método require un POST ou DELETE."
@@ -455,18 +631,18 @@ msgstr "Avatar actualizado."
msgid "No status with that ID found."
msgstr "Non existe ningún estado con esa ID atopada."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -481,7 +657,7 @@ msgstr "Formato de ficheiro de imaxe non soportado."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s updates favorited by %s / %s."
@@ -492,7 +668,7 @@ msgstr "%s updates favorited by %s / %s."
msgid "%s timeline"
msgstr "Liña de tempo de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -508,27 +684,22 @@ msgstr "%1$s / Chíos que respostan a %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Liña de tempo pública de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s chíos de calquera!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Replies to %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Replies to %s"
@@ -538,7 +709,7 @@ msgstr "Replies to %s"
msgid "Notices tagged with %s"
msgstr "Chíos tagueados con %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizacións dende %1$s en %2$s!"
@@ -600,8 +771,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -614,29 +785,6 @@ msgstr "Subir"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Envio de formulario non esperada."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -677,8 +825,9 @@ msgstr ""
"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
"ser notificado de ningunha resposta-@ del."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
@@ -687,13 +836,13 @@ msgstr "No"
msgid "Do not block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuario"
@@ -781,7 +930,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Non se pode eliminar a confirmación de email."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Confirmar enderezo"
#: actions/confirmaddress.php:159
@@ -799,10 +949,55 @@ msgstr "Código de confirmación."
msgid "Notices"
msgstr "Chíos"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "O chío non ten perfil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Ningún chío."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Non se pode eliminar este chíos."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Eliminar chío"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -835,7 +1030,7 @@ msgstr "Estas seguro que queres eliminar este chío?"
msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chíos."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chío"
@@ -977,16 +1172,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Gardar"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -999,10 +1184,89 @@ msgstr "Este chío non é un favorito!"
msgid "Add to favorites"
msgstr "Engadir a favoritos"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Ningún documento."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Outras opcions"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Ningún chío."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr ""
+"Usa este formulario para engadir etiquetas aos teus seguidores ou aos que "
+"sigues."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "A mesma contrasinal que arriba. Requerido."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "O nome completo é demasiado longo (max 255 car)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Subscricións"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "A páxina persoal semella que non é unha URL válida."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "A localización é demasiado longa (max 255 car.)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Non se puido actualizar o usuario."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1033,7 +1297,7 @@ msgstr "O teu Bio é demasiado longo (max 140 car.)."
msgid "Could not update group."
msgstr "Non se puido actualizar o usuario."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Non se puido crear o favorito."
@@ -1078,7 +1342,8 @@ msgstr ""
"a %s á túa lista de contactos?)"
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancelar"
@@ -1160,7 +1425,7 @@ msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
@@ -1172,7 +1437,7 @@ msgstr "Xa é o teu enderezo de correo."
msgid "That email address already belongs to another user."
msgstr "Este enderezo de correo xa pertence a outro usuario."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Non se puido inserir o código de confirmación."
@@ -1234,7 +1499,7 @@ msgstr "Este chío xa é un favorito!"
msgid "Disfavor favorite"
msgstr "Desactivar favorito"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Chíos populares"
@@ -1388,7 +1653,7 @@ msgstr "O usuario bloqueoute."
msgid "User is not a member of group."
msgstr "%1s non é unha orixe fiable."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Bloquear usuario"
@@ -1490,23 +1755,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1683,6 +1948,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Esa non é a túa conta Jabber."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Band. Entrada para %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1764,7 +2034,7 @@ msgstr "Mensaxe persoal"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1866,7 +2136,7 @@ msgstr "Usuario ou contrasinal incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -1875,17 +2145,6 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Alcume"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contrasinal"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Lembrarme"
@@ -1916,21 +2175,21 @@ msgstr ""
"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
"action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "O usuario bloqueoute."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "O usuario bloqueoute."
@@ -1939,6 +2198,29 @@ msgstr "O usuario bloqueoute."
msgid "No current status"
msgstr "Sen estado actual"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Ningún chío."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Non se puido crear o favorito."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -2050,6 +2332,51 @@ msgstr "Toque enviado"
msgid "Nudge sent!"
msgstr "Toque enviado!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Outras opcions"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "O chío non ten perfil"
@@ -2068,8 +2395,8 @@ msgstr "Conectar"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -2082,7 +2409,8 @@ msgid "Notice Search"
msgstr "Procura de Chíos"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Outros axustes"
#: actions/othersettings.php:71
@@ -2138,6 +2466,11 @@ msgstr "Contido do chío inválido"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Band. Saída para %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2211,7 +2544,7 @@ msgstr "Non se pode gardar a contrasinal."
msgid "Password saved."
msgstr "Contrasinal gardada."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2219,142 +2552,159 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Invitar"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "Recuperar"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Novo chío"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Configuracións de Twitter"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Avatar actualizado."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Avatar actualizado."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Chíos"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Recuperar"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Novo chío"
@@ -2419,7 +2769,7 @@ msgid "Full name"
msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
@@ -2443,7 +2793,7 @@ msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Localización"
@@ -2469,7 +2819,7 @@ msgstr ""
"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
"coma ou espazo"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Linguaxe"
@@ -2497,7 +2847,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Fuso Horario non seleccionado"
@@ -2510,24 +2860,24 @@ msgstr "A Linguaxe é demasiado longa (max 50 car.)."
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Non se puido actualizar o usuario para autosuscrición."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Non se puideron gardar as etiquetas."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Non se puido gardar o perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Non se puideron gardar as etiquetas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Configuracións gardadas."
@@ -2549,39 +2899,39 @@ msgstr "Liña de tempo pública"
msgid "Public timeline"
msgstr "Liña de tempo pública"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Sindicación do Fio Público"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Sindicación do Fio Público"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Sindicación do Fio Público"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2594,7 +2944,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2632,7 +2982,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2771,7 +3121,7 @@ msgstr "Acounteceu un erro co código de confirmación."
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -2817,7 +3167,7 @@ msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo Electrónico"
@@ -2925,7 +3275,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscribir"
@@ -2968,7 +3318,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
msgid "You already repeated that notice."
msgstr "Xa bloqueaches a este usuario."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Crear"
@@ -2984,6 +3334,11 @@ msgstr "Crear"
msgid "Replies to %s"
msgstr "Replies to %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Mensaxe de %1$s en %2$s"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -3025,6 +3380,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Mensaxe de %1$s en %2$s"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Avatar actualizado."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -3035,6 +3395,126 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "User is already sandboxed."
msgstr "O usuario bloqueoute."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Configuracións de Twitter"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "O chío non ten perfil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Alcume"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Invitación(s) enviada(s)."
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Subscricións"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Estas seguro que queres eliminar este chío?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Chíos favoritos de %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Non se pode "
@@ -3084,18 +3564,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Tódalas subscricións"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "Non existe o perfil."
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "Chíos"
@@ -3145,10 +3630,6 @@ msgstr "(nada)"
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Estatísticas"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3213,6 +3694,11 @@ msgstr "Chío publicado"
msgid " tagged %s"
msgstr "Chíos tagueados con %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s e amigos"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3238,25 +3724,25 @@ msgstr "Fonte de chíos para %s"
msgid "FOAF for %s"
msgstr "Band. Saída para %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3269,7 +3755,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3281,7 +3767,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Replies to %s"
@@ -3300,206 +3786,148 @@ msgstr "O usuario bloqueoute."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Non é unha dirección de correo válida"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Novo chío"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Nova dirección de email para posterar en %s"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Localización"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "Linguaxe preferida"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Recuperar"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Aceptar"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Privacidade"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Invitar"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Bloquear"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Configuracións de Twitter"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3607,15 +4035,26 @@ msgstr "Non se inseriu ningún código"
msgid "You are not subscribed to that profile."
msgstr "Non estás suscrito a ese perfil"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Non se pode gardar a subscrición."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Non é usuario local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ningún chío."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Suscrito"
@@ -3675,7 +4114,7 @@ msgstr "Esa é a xente á que lle estas a escoitar os seus chíos"
msgid "These are the people whose notices %s listens to."
msgstr "Esta é a xente á que lle estas a escoitar os chíos %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3685,19 +4124,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s está a escoitar os teus chíos %2$s."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Usuarios auto-etiquetados como %s - páxina %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3728,7 +4172,8 @@ msgstr "Tags"
msgid "User profile"
msgstr "O usuario non ten perfil."
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3793,7 +4238,7 @@ msgstr "Non hai identificador de perfil na peticion."
msgid "Unsubscribed"
msgstr "De-suscribido"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3808,91 +4253,71 @@ msgstr "Usuario"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "Invitar a novos usuarios"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Tódalas subscricións"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
"non humáns)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Invitación(s) enviada(s)."
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "Invitación(s) enviada(s)."
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Subscrición de autorización."
@@ -3908,38 +4333,38 @@ msgstr ""
"user's notices. If you didn't just ask to subscribe to someone's notices, "
"click \"Cancel\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Aceptar"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "Suscrito a %s"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Rexeitar"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Subscrición de autorización."
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Sen petición de autorización!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Subscrición autorizada"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3950,11 +4375,11 @@ msgstr ""
"proporcionada. Comproba coas instruccións do sitio para máis detalles en "
"como autorizar subscricións. O teu token de subscrición é:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Subscrición rexeitada"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3965,37 +4390,37 @@ msgstr ""
"with the site's instructions for details on how to fully reject the "
"subscription."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Non se pode ler a URL do avatar de '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Tipo de imaxe incorrecto para '%s'"
@@ -4015,6 +4440,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Tódalas subscricións"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -4041,11 +4471,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Avatar actualizado."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4077,12 +4502,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Alcume"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Persoal"
@@ -4091,11 +4511,6 @@ msgstr "Persoal"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Subscricións"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4146,28 +4561,28 @@ msgstr "Non se pode inserir unha mensaxe."
msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe coa nova URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erro ó inserir o hashtag na BD: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4176,35 +4591,62 @@ msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erro ó inserir a contestación na BD: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Este usuario non che permite suscribirte a el."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "O usuario bloqueoute."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Non está suscrito!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Non se pode eliminar a subscrición."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Non se pode eliminar a subscrición."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaxe de %1$s en %2$s"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Non se puido crear o favorito."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Non se pode gardar a subscrición."
@@ -4248,139 +4690,134 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Persoal"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "Sobre"
-
-#: lib/action.php:435
+#: lib/action.php:441
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Navegación de subscricións"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
"este servizo."
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Crear nova conta"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Axuda"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Sobre"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4389,12 +4826,12 @@ msgstr ""
"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é un servizo de microbloguexo."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4405,38 +4842,59 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Antes »"
-#: lib/action.php:1167
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4473,11 +4931,105 @@ msgstr "Confirmar correo electrónico"
msgid "Design configuration"
msgstr "Confirmación de SMS"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Confirmación de SMS"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Confirmación de SMS"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "Confirmación de SMS"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Confirmación de SMS"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Fonte"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Eliminar"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4499,12 +5051,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Contrasinal gardada."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Contrasinal gardada."
@@ -4662,55 +5214,64 @@ msgstr "Aconteceu un erro ó gardar o chío."
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica o nome do usuario ó que queres suscribirte"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Ningún usuario."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscribir de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comando non implementado."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificación desactivada."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "No se pode desactivar a notificación."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificación habilitada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Desuscribir de %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -4719,12 +5280,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -4733,12 +5294,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non estás suscrito a ese perfil"
@@ -4747,7 +5308,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:728
+#: lib/command.php:769
#, fuzzy
msgid ""
"Commands:\n"
@@ -4762,6 +5323,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4815,20 +5377,20 @@ msgstr ""
"tracks - non implementado por agora.\n"
"tracking - non implementado por agora.\n"
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Sen código de confirmación."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4844,6 +5406,15 @@ msgstr "Chíos dende mensaxería instantánea (IM)"
msgid "Updates by SMS"
msgstr "Chíos dende SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Conectar"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -5038,12 +5609,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5304,7 +5875,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " dende "
@@ -5426,62 +5997,58 @@ msgid "Do not share my location"
msgstr "Non se puideron gardar as etiquetas."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Sen contido!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
#, fuzzy
msgid "Reply to this notice"
msgstr "Non se pode eliminar este chíos."
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "contestar"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Chío publicado"
@@ -5518,12 +6085,7 @@ msgstr "Aconteceu un erro ó inserir o perfil remoto"
msgid "Duplicate notice"
msgstr "Eliminar chío"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Este usuario non che permite suscribirte a el."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Non se puido inserir a nova subscrición."
@@ -5539,19 +6101,19 @@ msgstr "Respostas"
msgid "Favorites"
msgstr "Favoritos"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Band. Entrada"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "As túas mensaxes entrantes"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Band. Saída"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "As túas mensaxes enviadas"
@@ -5636,6 +6198,10 @@ msgstr "Non se pode eliminar este chíos."
msgid "Repeat this notice"
msgstr "Non se pode eliminar este chíos."
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5710,36 +6276,6 @@ msgstr "Suscrito a %s"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "O usuario bloqueoute."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "No se pode suscribir."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Outro usuario non se puido suscribir a ti."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Non está suscrito!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Non se pode eliminar a subscrición."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Non se pode eliminar a subscrición."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5796,70 +6332,70 @@ msgstr "Avatar"
msgid "User actions"
msgstr "Outras opcions"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Configuración de perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "Non podes enviar mensaxes a este usurio."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "Nova mensaxe"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "fai un ano"
@@ -5873,7 +6409,7 @@ msgstr "%1s non é unha orixe fiable."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index c6e90c550..424917efb 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,17 +7,75 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:22+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:54+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "קבל"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "הגדרות"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "הירש×"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "פרטיות"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr ""
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "×ין משתמש ×›×–×”."
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "שמור"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "הגדרות"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -33,25 +91,29 @@ msgstr "×ין הודעה כזו."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "×ין משתמש ×›×–×”."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s וחברי×"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,7 +154,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +166,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s וחברי×"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -115,23 +177,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "קוד ×”×ישור ×œ× × ×ž×¦×."
@@ -146,7 +208,7 @@ msgstr "קוד ×”×ישור ×œ× × ×ž×¦×."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -177,8 +239,9 @@ msgstr "שמירת הפרופיל נכשלה."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -297,12 +360,12 @@ msgstr "עידכון המשתמש נכשל."
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "עידכון המשתמש נכשל."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "עידכון המשתמש נכשל."
@@ -325,7 +388,8 @@ msgstr "כינוי ×–×” כבר תפוס. נסה כינוי ×חר."
msgid "Not a valid nickname."
msgstr "×©× ×ž×©×ª×ž×© ×œ× ×—×•×§×™."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -337,7 +401,8 @@ msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª."
msgid "Full name is too long (max 255 chars)."
msgstr "×”×©× ×”×ž×œ× ×רוך מידי (מותרות 255 ×ותיות בלבד)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיות)"
@@ -373,7 +438,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "×œ× × ×ž×¦×"
@@ -417,6 +482,115 @@ msgstr ""
msgid "groups on %s"
msgstr ""
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "גודל ×œ× ×—×•×§×™."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "×©× ×”×ž×©×ª×ž×© ×ו הסיסמה ×œ× ×—×•×§×™×™×"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "שגי××” ביצירת ×©× ×”×ž×©×ª×ž×©."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "הגשת טופס ×œ× ×¦×¤×•×™×”."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+#, fuzzy
+msgid "Account"
+msgstr "×ודות"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "כינוי"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "סיסמה"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -449,17 +623,17 @@ msgstr "התמונה עודכנה."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "×œ× × ×ž×¦×"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -474,7 +648,7 @@ msgstr "פורמט התמונה ×ינו נתמך."
msgid "%1$s / Favorites from %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "מיקרובלוג מ×ת %s"
@@ -485,7 +659,7 @@ msgstr "מיקרובלוג מ×ת %s"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -501,27 +675,22 @@ msgstr "הסטטוס של %1$s ב-%2$s "
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "תגובת עבור %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "תגובת עבור %s"
@@ -531,7 +700,7 @@ msgstr "תגובת עבור %s"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "מיקרובלוג מ×ת %s"
@@ -594,8 +763,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
msgstr "מחק"
@@ -608,29 +777,6 @@ msgstr "ההעלה"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "הגשת טופס ×œ× ×¦×¤×•×™×”."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -669,8 +815,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "ל×"
@@ -679,13 +826,13 @@ msgstr "ל×"
msgid "Do not block this user"
msgstr "×ין משתמש ×›×–×”."
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "כן"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "×ין משתמש ×›×–×”."
@@ -772,7 +919,8 @@ msgid "Couldn't delete email confirmation."
msgstr ""
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "×שר כתובת"
#: actions/confirmaddress.php:159
@@ -790,10 +938,54 @@ msgstr "מיקו×"
msgid "Notices"
msgstr "הודעות"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "להודעה ×ין פרופיל"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "×ין הודעה כזו."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "×ין הודעה כזו."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -823,7 +1015,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "×ין הודעה כזו."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -964,16 +1156,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "שמור"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -987,10 +1169,84 @@ msgstr ""
msgid "Add to favorites"
msgstr "מועדפי×"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "×ין מסמך ×›×–×”."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "להודעה ×ין פרופיל"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "×ין הודעה כזו."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "×”×©× ×”×ž×œ× ×רוך מידי (מותרות 255 ×ותיות בלבד)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "כינוי ×–×” כבר תפוס. נסה כינוי ×חר."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "הרשמות"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "×©× ×”×ž×™×§×•× ×רוך מידי (מותר עד 255 ×ותיות)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "עידכון המשתמש נכשל."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1019,7 +1275,7 @@ msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיו
msgid "Could not update group."
msgstr "עידכון המשתמש נכשל."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "שמירת מידע התמונה נכשל"
@@ -1061,7 +1317,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "בטל"
@@ -1142,7 +1399,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr ""
@@ -1154,7 +1411,7 @@ msgstr ""
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "הכנסת קוד ×”×ישור נכשלה."
@@ -1213,7 +1470,7 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1368,7 +1625,7 @@ msgstr "למשתמש ×ין פרופיל."
msgid "User is not a member of group."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "×ין משתמש ×›×–×”."
@@ -1469,23 +1726,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1662,6 +1919,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "זהו ×œ× ×–×™×”×•×™ ×”-Jabber שלך."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1738,7 +2000,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "שלח"
@@ -1814,7 +2076,7 @@ msgstr "×©× ×ž×©×ª×ž×© ×ו סיסמה ×œ× × ×›×•× ×™×."
msgid "Error setting user. You are probably not authorized."
msgstr "×œ× ×ž×•×¨×©×”."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
@@ -1823,17 +2085,6 @@ msgstr "היכנס"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "כינוי"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "סיסמה"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "זכור ×ותי"
@@ -1861,21 +2112,21 @@ msgstr ""
"היכנס בעזרת ×©× ×”×ž×©×ª×ž×© והסיסמה שלך. עדיין ×ין לך ×©× ×ž×©×ª×ž×©? [הרש×](%%action."
"register%%) לחשבון "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "למשתמש ×ין פרופיל."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "נכשלה יצירת OpenID מתוך: %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "למשתמש ×ין פרופיל."
@@ -1884,6 +2135,28 @@ msgstr "למשתמש ×ין פרופיל."
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "×ין הודעה כזו."
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "שמירת מידע התמונה נכשל"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -1992,6 +2265,49 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "להודעה ×ין פרופיל"
@@ -2010,8 +2326,8 @@ msgstr "התחבר"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2025,7 +2341,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "הגדרות"
#: actions/othersettings.php:71
@@ -2082,6 +2398,11 @@ msgstr "תוכן ההודעה ×œ× ×—×•×§×™"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2154,7 +2475,7 @@ msgstr "×œ× × ×™×ª×Ÿ לשמור ×ת הסיסמה"
msgid "Password saved."
msgstr "הסיסמה נשמרה."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2162,141 +2483,158 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "עמוד ×–×” ×ינו זמין בסוג מדיה ש×תה יכול לקבל"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "שיחזור"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "הודעה חדשה"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "תמונה"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "הגדרות"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "התמונה עודכנה."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "התמונה עודכנה."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "סמס"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "שיחזור"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "הודעות"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "שיחזור"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "הודעה חדשה"
@@ -2358,7 +2696,7 @@ msgid "Full name"
msgstr "×©× ×ž×œ×"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "×תר בית"
@@ -2382,7 +2720,7 @@ msgstr "ביוגרפיה"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "מיקו×"
@@ -2406,7 +2744,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "שפה"
@@ -2432,7 +2770,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיות)"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2445,25 +2783,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "כתובת ×תר הבית '%s' ××™× ×” חוקית"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "ההגדרות נשמרו."
@@ -2485,39 +2823,39 @@ msgstr "קו זמן ציבורי"
msgid "Public timeline"
msgstr "קו זמן ציבורי"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "הזנת ×–×¨× ×”×¦×™×‘×•×¨×™"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "הזנת ×–×¨× ×”×¦×™×‘×•×¨×™"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "הזנת ×–×¨× ×”×¦×™×‘×•×¨×™"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2526,7 +2864,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2560,7 +2898,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2697,7 +3035,7 @@ msgstr "שגי××” ב×ישור הקוד."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "הירש×"
@@ -2737,7 +3075,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2825,7 +3163,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תו×× ×חר"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "×”×™×¨×©× ×›×ž× ×•×™"
@@ -2866,7 +3204,7 @@ msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון"
msgid "You already repeated that notice."
msgstr "כבר נכנסת למערכת!"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "צור"
@@ -2882,6 +3220,11 @@ msgstr "צור"
msgid "Replies to %s"
msgstr "תגובת עבור %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "תגובת עבור %s"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2923,6 +3266,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "תגובת עבור %s"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "התמונה עודכנה."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2933,6 +3281,124 @@ msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
msgid "User is already sandboxed."
msgstr "למשתמש ×ין פרופיל."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "הגדרות"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "להודעה ×ין פרופיל"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "כינוי"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "מיקו×"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "הרשמות"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "סטטיסטיקה"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s וחברי×"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2982,18 +3448,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "כל המנויי×"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "×ין הודעה כזו."
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "הודעות"
@@ -3041,10 +3512,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "סטטיסטיקה"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3101,6 +3568,11 @@ msgstr "הודעות"
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s וחברי×"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3126,25 +3598,25 @@ msgstr "הזנת הודעות של %s"
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3153,7 +3625,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3161,7 +3633,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "תגובת עבור %s"
@@ -3179,202 +3651,145 @@ msgstr "למשתמש ×ין פרופיל."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr ""
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "הודעה חדשה"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "מיקו×"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "שיחזור"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "קבל"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "פרטיות"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "×ין משתמש ×›×–×”."
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "הגדרות"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3475,17 +3890,27 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "יצירת המנוי נכשלה."
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "×ין משתמש ×›×–×”."
+msgid "No such profile."
+msgstr "×ין הודעה כזו."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "×”×™×¨×©× ×›×ž× ×•×™"
@@ -3546,7 +3971,7 @@ msgstr "×לה ×”×× ×©×™× ×©×œ×”×•×“×¢×•×ª ×©×œ×”× ×תה מ×זין."
msgid "These are the people whose notices %s listens to."
msgstr "×לה ×”×× ×©×™× ×©%s מ×זין להודעות שלה×."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3556,20 +3981,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s כעת מ×זין להודעות שלך ב-%2$s"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "×ין זיהוי Jabber ×›×–×”."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "סמס"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "מיקרובלוג מ×ת %s"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3600,7 +4030,8 @@ msgstr ""
msgid "User profile"
msgstr "למשתמש ×ין פרופיל."
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3662,7 +4093,7 @@ msgstr "השרת ×œ× ×”×—×–×™×¨ כתובת פרופיל"
msgid "Unsubscribed"
msgstr "בטל מנוי"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3677,88 +4108,68 @@ msgstr "מתשמש"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "פרופיל"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "מחק"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "כל המנויי×"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "ההרשמה ×ושרה"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "מיקו×"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "×שר מנוי"
@@ -3773,38 +4184,38 @@ msgstr ""
"בדוק ×ת ×”×¤×¨×˜×™× ×›×“×™ ×œ×•×•×“× ×©×‘×¨×¦×•× ×š ×œ×”×™×¨×©× ×›×ž× ×•×™ להודעות משתמש ×–×”. ×× ×ינך רוצה "
"להירש×, לחץ \"בטל\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "קבל"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "ההרשמה ×ושרה"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "דחה"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "כל המנויי×"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "×œ× ×”×ª×‘×§×© ×ישור!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "ההרשמה ×ושרה"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3814,11 +4225,11 @@ msgstr ""
"המנוי ×ושר, ×בל ×œ× ×”×ª×§×‘×œ×” כתובת ×ליה ניתן לחזור. בדוק ×ת הור×ות ×”×תר וחפש "
"כיצד ל×שר מנוי. ×סימון המנוי שלך הו×:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "ההרשמה נדחתה"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3828,37 +4239,37 @@ msgstr ""
"המנוי נדחה, ×בל ×œ× ×”×ª×§×‘×œ×” כתובת לחזרה. בדוק ×ת הור×ות ×”×תר וחפש כיצד ×œ×”×©×œ×™× "
"דחיית מנוי."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "×œ× × ×™×ª×Ÿ ×œ×§×¨×•× ×ת ×”-URL '%s' של התמונה"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "סוג התמונה של '%s' ×ינו מת××™×"
@@ -3878,6 +4289,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "כל המנויי×"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3904,11 +4320,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "התמונה עודכנה."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3940,12 +4351,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "כינוי"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "×ישי"
@@ -3954,11 +4360,6 @@ msgstr "×ישי"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "הרשמות"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4008,61 +4409,88 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "למשתמש ×ין פרופיל."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "×œ× ×ž× ×•×™!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "שמירת מידע התמונה נכשל"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "יצירת המנוי נכשלה."
@@ -4106,136 +4534,131 @@ msgstr "הסטטוס של %1$s ב-%2$s "
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "בית"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "×ודות"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "התחבר"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "הרשמות"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "צ×"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "צור חשבון חדש"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "עזרה"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "חיפוש"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "×ודות"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "רשימת ש×לות נפוצות"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "פרטיות"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "מקור"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4244,12 +4667,12 @@ msgstr ""
"**%%site.name%%** ×”×•× ×©×¨×•×ª ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ×”×•× ×©×¨×•×ª ביקרובלוג."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4260,35 +4683,57 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "<< ×חרי"
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "לפני >>"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4320,11 +4765,105 @@ msgstr "הרשמות"
msgid "Design configuration"
msgstr ""
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "הרשמות"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "הרשמות"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "הרשמות"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "הרשמות"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "מקור"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "הכתובת של ×תר הבית שלך, בלוג, ×ו פרופיל ב×תר ×חר "
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "הכתובת של ×תר הבית שלך, בלוג, ×ו פרופיל ב×תר ×חר "
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "הסר"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4346,12 +4885,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "הסיסמה נשמרה."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "הסיסמה נשמרה."
@@ -4507,83 +5046,93 @@ msgstr "בעיה בשמירת ההודעה."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "×ין משתמש ×›×–×”."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "בטל מנוי"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
msgstr[1] "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
msgstr[1] "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4597,6 +5146,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4624,20 +5174,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "×ין קוד ×ישור."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4653,6 +5203,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "התחבר"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4844,12 +5403,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5053,7 +5612,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5173,61 +5732,57 @@ msgid "Do not share my location"
msgstr "שמירת הפרופיל נכשלה."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "ל×"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "×ין תוכן!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "צור"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "הגב"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "הודעות"
@@ -5261,11 +5816,7 @@ msgstr "שגי××” בהכנסת פרופיל מרוחק"
msgid "Duplicate notice"
msgstr "הודעה חדשה"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "הכנסת מנוי חדש נכשלה."
@@ -5281,19 +5832,19 @@ msgstr "תגובות"
msgid "Favorites"
msgstr "מועדפי×"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5376,6 +5927,10 @@ msgstr "×ין הודעה כזו."
msgid "Repeat this notice"
msgstr "×ין הודעה כזו."
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5448,37 +6003,6 @@ msgstr "הרשמה מרוחקת"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "למשתמש ×ין פרופיל."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "×œ× ×ž× ×•×™!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5533,69 +6057,69 @@ msgstr "תמונה"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "הגדרות הפרופיל"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "הודעה חדשה"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "לפני כיו×"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "לפני ×›-%d ימי×"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "לפני ×›-%d חודשי×"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "לפני כשנה"
@@ -5609,7 +6133,7 @@ msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 8f548104d..7b6870afe 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,18 +9,73 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:25+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:58+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
"n%100==4) ? 2 : 3)\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Přistup"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Sydłowe nastajenja składować"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Registrować"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Priwatny"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Jenož přeprosyć"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "ZaÄinjeny"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Nowe registrowanja znjemóžnić."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Składować"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Sydłowe nastajenja składować"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +90,29 @@ msgstr "Strona njeeksistuje"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Wužiwar njeeksistuje"
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s a přećeljo, strona %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -94,7 +153,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -105,8 +164,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ty a přećeljo"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -116,23 +175,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metoda njenamakana."
@@ -146,7 +205,7 @@ msgstr "API-metoda njenamakana."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Tuta metoda wužaduje sej POST."
@@ -175,8 +234,9 @@ msgstr "Profil njeje so składować dał."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -290,11 +350,11 @@ msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować."
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr ""
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr ""
@@ -316,7 +376,8 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
msgid "Not a valid nickname."
msgstr "Žane płaćiwe přimjeno."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -328,7 +389,8 @@ msgstr "Startowa strona njeje płaćiwy URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Wopisanje je předołho (maks. %d znamješkow)."
@@ -364,7 +426,7 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Skupina njenamakana!"
@@ -405,6 +467,113 @@ msgstr ""
msgid "groups on %s"
msgstr "skupiny na %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Njepłaćiwa wulkosć."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Njepłaćiwe přimjeno abo hesło!"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Přimjeno"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Hesło"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Wotpokazać"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Dowolić"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Tuta metoda wužaduje sej POST abo DELETE."
@@ -434,17 +603,17 @@ msgstr "Status zniÄeny."
msgid "No status with that ID found."
msgstr "Žadyn status z tym ID namakany."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Njenamakany"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -458,7 +627,7 @@ msgstr "Njepodpěrany format."
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -469,7 +638,7 @@ msgstr ""
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -485,27 +654,22 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -515,7 +679,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -576,8 +740,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Přehlad"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "ZniÄić"
@@ -589,29 +753,6 @@ msgstr "Nahrać"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -647,8 +788,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "NÄ›"
@@ -656,13 +798,13 @@ msgstr "NÄ›"
msgid "Do not block this user"
msgstr "Tutoho wužiwarja njeblokować"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Haj"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
@@ -745,7 +887,7 @@ msgid "Couldn't delete email confirmation."
msgstr ""
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Adresu wobkrućić"
#: actions/confirmaddress.php:159
@@ -762,10 +904,53 @@ msgstr "Konwersacija"
msgid "Notices"
msgstr "Zdźělenki"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Aplikaciski profil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Njejsy wobsedźer tuteje aplikacije."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Aplikacija njeeksistuje."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Tutu zdźělenku njewušmórnyć"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Tutu zdźělenku wušmórnyć"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -794,7 +979,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
msgid "Do not delete this notice"
msgstr "Tutu zdźělenku njewušmórnyć"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Tutu zdźělenku wušmórnyć"
@@ -923,16 +1108,6 @@ msgstr "Standardne designy wobnowić"
msgid "Reset back to default"
msgstr "Na standard wróćo stajić"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Składować"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Design składować"
@@ -945,10 +1120,78 @@ msgstr "Tuta zdźělenka faworit njeje!"
msgid "Add to favorites"
msgstr "K faworitam přidać"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Dokument njeeksistuje."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Aplikacije OAuth"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Aplikacija njeeksistuje."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Wužij tutón formular, zo by aplikaciju wobdźěłał."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Mjeno je trěbne."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Mjeno je předołho (maks. 255 znamješkow)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Wopisanje je trěbne."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "URL žórła płaćiwy njeje."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Aplikacija njeda so aktualizować."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -976,7 +1219,7 @@ msgstr "wopisanje je předołho (maks. %d znamješkow)."
msgid "Could not update group."
msgstr "Skupina njeje so dała aktualizować."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Aliasy njejsu so dali wutworić."
@@ -1015,7 +1258,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Přetorhnyć"
@@ -1095,7 +1339,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -1107,7 +1351,7 @@ msgstr "To je hižo twoja e-mejlowa adresa."
msgid "That email address already belongs to another user."
msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr ""
@@ -1166,7 +1410,7 @@ msgstr "Tuta zdźělenka je hižo faworit!"
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Woblubowane zdźělenki"
@@ -1308,7 +1552,7 @@ msgstr "Wužiwar je hižo za skupinu zablokowany."
msgid "User is not a member of group."
msgstr "Wužiwar njeje ÄÅ‚on skupiny."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Wužiwarja za skupinu blokować"
@@ -1401,23 +1645,23 @@ msgstr "%1$s skupinskich ÄÅ‚onow, strona %2$d"
msgid "A list of the users in this group."
msgstr "Lisćina wužiwarjow w tutej skupinje."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blokować"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Tutoho wužiwarja k administratorej Äinić"
@@ -1576,6 +1820,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "To njeje twój ID Jabber."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1654,7 +1903,7 @@ msgstr "Wosobinska powěsć"
msgid "Optionally add a personal message to the invitation."
msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Pósłać"
@@ -1728,7 +1977,7 @@ msgstr "WopaÄne wužiwarske mjeno abo hesÅ‚o."
msgid "Error setting user. You are probably not authorized."
msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přizjewić"
@@ -1737,17 +1986,6 @@ msgstr "Přizjewić"
msgid "Login to site"
msgstr "Při sydle přizjewić"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Přimjeno"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Hesło"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Składować"
@@ -1773,21 +2011,21 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Jenož administrator móže druheho wužiwarja k administratorej Äinić."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s je hižo administrator za skupinu \"%2$s\"."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "PÅ™istup na datowu sadźbu ÄÅ‚ona %1$S w skupinje %2$s móžno njeje."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s Äinić."
@@ -1796,6 +2034,27 @@ msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s Äinić."
msgid "No current status"
msgstr "Žadyn aktualny status"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Aplikacija njeeksistuje."
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju registrował."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Aplikacija njeda so wutworić."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nowa skupina"
@@ -1900,6 +2159,48 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Dyrbiš přizjewjeny być, zo by swoje aplikacije nalistował."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Aplikacije OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Njejsy wužiwar tuteje aplikacije."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Zdźělenka nima profil"
@@ -1917,8 +2218,8 @@ msgstr ""
msgid "Only "
msgstr "Jenož "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -1931,7 +2232,7 @@ msgid "Notice Search"
msgstr "Zdźělenku pytać"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Druhe nastajenja"
#: actions/othersettings.php:71
@@ -1963,28 +2264,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Žana skupina podata."
+msgstr "Žadyn wužiwarski ID podaty."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Žana zdźělenka podata."
+msgstr "Žane přizjewjenske znamješko podate."
#: actions/otp.php:90
msgid "No login token requested."
msgstr ""
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Žana zdźělenka podata."
+msgstr "Njepłaćiwe přizjewjenske znamješko podate."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Při sydle přizjewić"
+msgstr "Přizjewjenske znamješko spadnjene."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
#: actions/outbox.php:61
#, php-format
@@ -2056,7 +2358,7 @@ msgstr ""
msgid "Password saved."
msgstr "Hesło składowane."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Šćežki"
@@ -2064,132 +2366,148 @@ msgstr "Šćežki"
msgid "Path and server settings for this StatusNet site."
msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Sydło"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Serwer"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Šćežka"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Sydłowa šćežka"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Šćežka k lokalam"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Zapisowa šćežka k lokalam"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Å at"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Å atowy serwer"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Šatowa šćežka"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Å atowy zapis"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Awatary"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Awatarowy serwer"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Awatarowa šćežka"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Awatarowy zapis"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Pozadki"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Pozadkowy serwer"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Pozadkowa šćežka"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Pozadkowy zapis"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Ženje"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Druhdy"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Přeco"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "SSL wužiwać"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-serwer"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Šćežki składować"
@@ -2247,7 +2565,7 @@ msgid "Full name"
msgstr "Dospołne mjeno"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Startowa strona"
@@ -2270,7 +2588,7 @@ msgstr "Biografija"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Městno"
@@ -2294,7 +2612,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "RÄ›Ä"
@@ -2320,7 +2638,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Biografija je předołha (maks. %d znamješkow)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "ÄŒasowe pasmo njeje wubrane."
@@ -2333,23 +2651,23 @@ msgstr "Mjeno rÄ›Äe je pÅ™edoÅ‚he (maks. 50 znamjeÅ¡kow)."
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Nastajenja městna njedachu so składować."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr ""
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Nastajenja składowane."
@@ -2371,36 +2689,36 @@ msgstr ""
msgid "Public timeline"
msgstr ""
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr ""
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2409,7 +2727,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2442,7 +2760,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2579,7 +2897,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
@@ -2619,7 +2937,7 @@ msgid "Same as password above. Required."
msgstr "Jenake kaž hesło horjeka. Trěbne."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mejl"
@@ -2703,7 +3021,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abonować"
@@ -2739,7 +3057,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować."
msgid "You already repeated that notice."
msgstr "Sy tutu zdźělenku hižo wospjetował."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Wospjetowany"
@@ -2753,6 +3071,11 @@ msgstr "Wospjetowany!"
msgid "Replies to %s"
msgstr ""
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr ""
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2794,6 +3117,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2802,6 +3129,121 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Posedźenja"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Designowe nastajenja za tute sydło StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Z posedźenjemi wobchadźeć"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Sydłowe nastajenja składować"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Aplikaciski profil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Mjeno"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organizacija"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Wopisanje"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistika"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "URL awtorizować"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%1$s a přećeljo, strona %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2851,17 +3293,22 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s skupinskich ÄÅ‚onow, strona %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Skupinski profil"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr ""
@@ -2907,10 +3354,6 @@ msgstr "(Žadyn)"
msgid "All members"
msgstr "WÅ¡itcy ÄÅ‚onojo"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistika"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Wutworjeny"
@@ -2965,6 +3408,11 @@ msgstr "Zdźělenka zniÄena."
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s a přećeljo, strona %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -2990,25 +3438,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr "FOAF za %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3017,7 +3465,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3025,7 +3473,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr ""
@@ -3042,195 +3490,143 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Dyrbiš płaćiwu kontaktowu e-mejlowu adresu měć."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "Njeznata rÄ›Ä \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Powšitkowny"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Sydłowe mjeno"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Lokalny"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Standardne Äasowe pasmo"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Standardna sydÅ‚owa rÄ›Ä"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Serwer"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Přistup"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Priwatny"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Jenož přeprosyć"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "ZaÄinjeny"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Nowe registrowanja znjemóžnić."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frekwenca"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limity"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Tekstowy limit"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Maksimalna liÄba znamjeÅ¡kow za zdźělenki."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Sydłowe nastajenja składować"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "SMS-nastajenja"
@@ -3327,15 +3723,26 @@ msgstr "Žadyn kod zapodaty"
msgid "You are not subscribed to that profile."
msgstr "Njejsy tón profil abonował."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr ""
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Njeje lokalny wužiwar."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Dataja njeeksistuje."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Njejsy tón profil abonował."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonowany"
@@ -3395,7 +3802,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3405,19 +3812,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr ""
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3446,7 +3858,8 @@ msgstr ""
msgid "User profile"
msgstr "Wužiwarski profil"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3501,7 +3914,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr "Wotskazany"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3516,84 +3929,64 @@ msgstr "Wužiwar"
msgid "User settings for this StatusNet site."
msgstr "Wužiwarske nastajenja za sydło StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nowi wužiwarjo"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Powitanje noweho wužiwarja"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Standardny abonement"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr ""
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Přeprošenja"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Přeprošenja zmóžnjene"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Posedźenja"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Z posedźenjemi wobchadźeć"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3605,84 +3998,84 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licenca"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Akceptować"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Tutoho wužiwarja abonować"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Wotpokazać"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Tutón abonement wotpokazać"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Abonement awtorizowany"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Abonement wotpokazany"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr ""
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3701,6 +4094,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s skupinskich ÄÅ‚onow, strona %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3727,10 +4125,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3762,11 +4156,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-msgid "Name"
-msgstr "Mjeno"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Wersija"
@@ -3774,10 +4164,6 @@ msgstr "Wersija"
msgid "Author(s)"
msgstr "Awtorojo"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Wopisanje"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3796,19 +4182,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Skupinski profil"
+msgstr "Přizamknjenje k skupinje je so njeporadźiło."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Skupina njeje so dała aktualizować."
+msgstr "Njeje dźěl skupiny."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Skupinski profil"
+msgstr "Wopušćenje skupiny je so njeporadźiło."
#: classes/Login_token.php:76
#, php-format
@@ -3827,58 +4210,81 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Hižo abonowany!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Wužiwar je će zablokował."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Njeje abonowany!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Sebjeabonement njeje so daÅ‚ zniÄić."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Abonoment njeje so daÅ‚ zniÄić."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr ""
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr ""
@@ -3911,148 +4317,144 @@ msgid "Other options"
msgstr "Druhe opcije"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Strona bjez titula"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-msgid "Account"
-msgstr "Konto"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Zwjazać"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Přeprosyć"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Konto załožić"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Pytać"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Wo"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Huste prašenja"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Priwatnosć"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Žórło"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4060,32 +4462,54 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr ""
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4116,10 +4540,99 @@ msgstr ""
msgid "Design configuration"
msgstr ""
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS-wobkrućenje"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS-wobkrućenje"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr ""
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS-wobkrućenje"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Wopisaj swoju aplikaciju z %d znamješkami"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Wopisaj swoju aplikaciju"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL žórła"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Wotwołać"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4140,11 +4653,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Změnjenje hesła je so njeporadźiło"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Změnjenje hesła njeje dowolene"
@@ -4187,44 +4700,41 @@ msgid ""
msgstr ""
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "Zdźělenka z tym ID njeeksistuje."
+msgstr "Zdźělenka z tym ID njeeksistuje"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
-#, fuzzy
msgid "User has no last notice"
-msgstr "Wužiwar nima poslednju powěsć."
+msgstr "Wužiwar nima poslednju powěsć"
#: lib/command.php:190
msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Sy hižo ÄÅ‚on teje skupiny."
+msgstr "Sy hižo ÄÅ‚on teje skupiny"
#: lib/command.php:231
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
+msgstr "Njebě móžno wužiwarja %s skupinje %s přidać"
#: lib/command.php:236
-#, fuzzy, php-format
+#, php-format
msgid "%s joined group %s"
-msgstr "Wužiwarske skupiny"
+msgstr "%s je so k skupinje %s přizamknył"
#: lib/command.php:275
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Njebě móžno wužiwarja %1$s do skupiny $2$s přesunyć."
+msgstr "Njebě móžno wužiwarja %s do skupiny %s přesunyć"
#: lib/command.php:280
-#, fuzzy, php-format
+#, php-format
msgid "%s left group %s"
-msgstr "Wužiwarske skupiny"
+msgstr "%s je skupinu %s wopušćił"
#: lib/command.php:309
#, php-format
@@ -4252,18 +4762,17 @@ msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:367
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent"
-msgstr "Direktna powěsć do %s pósłana."
+msgstr "Direktna powěsć do %s pósłana"
#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "Njemóžno twoju zdźělenku wospjetować."
+msgstr "Njemóžeš swójsku powěsć wospjetować"
#: lib/command.php:418
msgid "Already repeated that notice"
@@ -4284,9 +4793,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:491
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Wotmołwa na %s pósłana."
+msgstr "Wotmołwa na %s pósłana"
#: lib/command.php:493
msgid "Error saving notice."
@@ -4296,54 +4805,64 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Wužiwar njeeksistuje"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Wotskazany"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sy tutu wosobu abonował:"
@@ -4351,11 +4870,11 @@ msgstr[1] "Sy tutej wosobje abonował:"
msgstr[2] "Sy tute wosoby abonował:"
msgstr[3] "Sy tute wosoby abonował:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Tuta wosoba je će abonowała:"
@@ -4363,11 +4882,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:"
msgstr[2] "Tute wosoby su će abonowali:"
msgstr[3] "Tute wosoby su će abonowali:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sy ÄÅ‚on tuteje skupiny:"
@@ -4375,7 +4894,7 @@ msgstr[1] "Sy ÄÅ‚on tuteju skupinow:"
msgstr[2] "Sy ÄÅ‚on tutych skupinow:"
msgstr[3] "Sy ÄÅ‚on tutych skupinow:"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4389,6 +4908,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4416,19 +4936,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Žana konfiguraciska dataja namakana. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4444,6 +4964,14 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Zwiski"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Zmylk w datowej bance"
@@ -4626,15 +5154,15 @@ msgstr "MB"
msgid "kB"
msgstr "KB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Njeznata rÄ›Ä \"%s\"."
+msgstr "Njeznate žórło postoweho kašćika %d."
#: lib/joinform.php:114
msgid "Join"
@@ -4826,7 +5354,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "wot"
@@ -4933,67 +5461,61 @@ msgid "Attach a file"
msgstr "Dataju připowěsnyć"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Městno dźělić."
+msgstr "Městno dźělić"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Městno njedźělić."
+msgstr "Njedźěl moje městno"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "S"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "J"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "W"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "Z"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Wospjetowany wot"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Na tutu zdźělenku wotmołwić"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Wotmołwić"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Zdźělenka wospjetowana"
@@ -5025,11 +5547,7 @@ msgstr "Zmylk při zasunjenju zdaleneho profila"
msgid "Duplicate notice"
msgstr "Dwójna zdźělenka"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5045,19 +5563,19 @@ msgstr "Wotmołwy"
msgid "Favorites"
msgstr "Fawority"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Twoje dochadźace powěsće"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Twoje pósłane powěsće"
@@ -5134,6 +5652,10 @@ msgstr "Tutu zdźělenku wospjetować?"
msgid "Repeat this notice"
msgstr "Tutu zdźělenku wospjetować"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5201,34 +5723,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Hižo abonowany!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Wužiwar je će zablokował."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Abonowanje njebě móžno"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Njeje abonowany!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Sebjeabonement njeje so daÅ‚ zniÄić."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Abonoment njeje so daÅ‚ zniÄić."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5279,67 +5773,67 @@ msgstr "Awatar wobdźěłać"
msgid "User actions"
msgstr "Wužiwarske akcije"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Profilowe nastajenja wobdźěłać"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Wobdźěłać"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Powěsć"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "před něšto sekundami"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
@@ -5355,7 +5849,7 @@ msgstr ""
"%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 "
"heksadecimalnych znamješkow."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 3115ed7ce..fa42bd3fe 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,17 +8,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:28+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:01+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Accesso"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Configurationes de accesso al sito"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registration"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Private"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Prohibir al usatores anonyme (sin session aperte) de vider le sito?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Solmente per invitation"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Permitter le registration solmente al invitatos."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Claudite"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Disactivar le creation de nove contos."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salveguardar"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Salveguardar configurationes de accesso"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -33,25 +85,29 @@ msgstr "Pagina non existe"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Usator non existe."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s e amicos, pagina %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -90,15 +146,15 @@ msgstr ""
"action.groups%%) o publica alique tu mesme."
#: actions/all.php:134
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Tu pote tentar [dar un pulsata a %s](../%s) in su profilo o [publicar un "
-"message a su attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Tu pote tentar [dar un pulsata a %1$s](../%2$s) in su profilo o [publicar un "
+"message a su attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -111,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "Tu e amicos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualisationes de %1$s e su amicos in %2$s!"
@@ -122,23 +178,23 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Methodo API non trovate."
@@ -152,7 +208,7 @@ msgstr "Methodo API non trovate."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Iste methodo require un POST."
@@ -183,8 +239,9 @@ msgstr "Non poteva salveguardar le profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -264,18 +321,16 @@ msgid "No status found with that ID."
msgstr "Nulle stato trovate con iste ID."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "Iste stato es ja favorite!"
+msgstr "Iste stato es ja favorite."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "Non poteva crear le favorite."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "Iste stato non es favorite!"
+msgstr "Iste stato non es favorite."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -295,19 +350,18 @@ msgid "Could not unfollow user: User not found."
msgstr "Non poteva cessar de sequer le usator: Usator non trovate."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "Tu non pote cessar de sequer te mesme!"
+msgstr "Tu non pote cessar de sequer te mesme."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "Duo IDs de usator o pseudonymos debe esser fornite."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Non poteva determinar le usator de origine."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Non poteva trovar le usator de destination."
@@ -329,7 +383,8 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
msgid "Not a valid nickname."
msgstr "Non un pseudonymo valide."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -341,7 +396,8 @@ msgstr "Le pagina personal non es un URL valide."
msgid "Full name is too long (max 255 chars)."
msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Description es troppo longe (max %d charachteres)."
@@ -377,7 +433,7 @@ msgstr "Le alias non pote esser identic al pseudonymo."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Gruppo non trovate!"
@@ -390,18 +446,18 @@ msgid "You have been blocked from that group by the admin."
msgstr "Le administrator te ha blocate de iste gruppo."
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Non poteva inscriber le usator %s in le gruppo %s."
+msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr "Tu non es membro de iste gruppo."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Non poteva remover le usator %s del gruppo %s."
+msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -418,6 +474,118 @@ msgstr "Gruppos de %s"
msgid "groups on %s"
msgstr "gruppos in %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Nulle parametro oauth_token fornite."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Indicio invalide."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Nomine de usator o contrasigno invalide!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+"Error del base de datos durante le deletion del usator del application OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Error del base de datos durante le insertion del usator del application "
+"OAuth."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Le indicio de requesta %s ha essite autorisate. Per favor excambia lo pro un "
+"indicio de accesso."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Le indicio de requesta %s ha essite refusate e revocate."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Submission de formulario inexpectate."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Un application vole connecter se a tu conto"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Permitter o refusar accesso"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Le application <strong>%1$s</strong> per <strong>%2$s</strong> vole poter "
+"<strong>%3$s</strong> le datos de tu conto de %4$s. Tu debe solmente dar "
+"accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Conto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Pseudonymo"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contrasigno"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Refusar"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Permitter"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Permitter o refusar accesso al informationes de tu conto."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Iste methodo require un commando POST o DELETE."
@@ -447,18 +615,18 @@ msgstr "Stato delite."
msgid "No status with that ID found."
msgstr "Nulle stato trovate con iste ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Isto es troppo longe. Le longitude maximal del notas es %d characteres."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Non trovate"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -470,14 +638,14 @@ msgid "Unsupported format."
msgstr "Formato non supportate."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favorites de %s"
+msgstr "%1$s / Favorites de %2$s"
-#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:117
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s actualisationes favoritisate per %s / %s."
+msgstr "%1$s actualisationes favoritisate per %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -485,7 +653,7 @@ msgstr "%s actualisationes favoritisate per %s / %s."
msgid "%s timeline"
msgstr "Chronologia de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -502,27 +670,22 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Chronologia public de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Actualisationes de totes in %s!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Repetite per %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Repetite a %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repetitiones de %s"
@@ -532,7 +695,7 @@ msgstr "Repetitiones de %s"
msgid "Notices tagged with %s"
msgstr "Notas con etiquetta %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualisationes con etiquetta %1$s in %2$s!"
@@ -543,7 +706,7 @@ msgstr "Non trovate."
#: actions/attachment.php:73
msgid "No such attachment."
-msgstr "Attachamento non existe."
+msgstr "Annexo non existe."
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -569,7 +732,8 @@ msgstr "Avatar"
#: actions/avatarsettings.php:78
#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Tu pote cargar tu avatar personal. Le dimension maxime del file es %s."
+msgstr ""
+"Tu pote incargar tu avatar personal. Le dimension maximal del file es %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
@@ -592,42 +756,19 @@ msgstr "Original"
msgid "Preview"
msgstr "Previsualisation"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Deler"
#: actions/avatarsettings.php:166 actions/grouplogo.php:233
msgid "Upload"
-msgstr "Cargar"
+msgstr "Incargar"
#: actions/avatarsettings.php:231 actions/grouplogo.php:286
msgid "Crop"
msgstr "Taliar"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Submission de formulario inexpectate."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Selige un area quadrate del imagine pro facer lo tu avatar"
@@ -666,8 +807,9 @@ msgstr ""
"cancellate, ille non potera resubscriber se a te in le futuro, e tu non "
"recipera notification de su @-responsas."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
@@ -675,13 +817,13 @@ msgstr "No"
msgid "Do not block this user"
msgstr "Non blocar iste usator"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocar iste usator"
@@ -705,9 +847,9 @@ msgid "%s blocked profiles"
msgstr "%s profilos blocate"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s profilos blocate, pagina %d"
+msgstr "%1$s profilos blocate, pagina %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -764,7 +906,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Non poteva deler confirmation de e-mail."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Confirmar adresse"
#: actions/confirmaddress.php:159
@@ -781,10 +923,51 @@ msgstr "Conversation"
msgid "Notices"
msgstr "Notas"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Tu debe aperir un session pro deler un application."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Application non trovate."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Tu non es le proprietario de iste application."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Il habeva un problema con tu indicio de session."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Deler application"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Es tu secur de voler deler iste application? Isto radera tote le datos super "
+"le application del base de datos, includente tote le existente connexiones "
+"de usator."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Non deler iste application"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Deler iste application"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -815,7 +998,7 @@ msgstr "Es tu secur de voler deler iste nota?"
msgid "Do not delete this notice"
msgstr "Non deler iste nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Deler iste nota"
@@ -896,8 +1079,8 @@ msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-"Tu pote cargar un imagine de fundo pro le sito. Le dimension maxime del file "
-"es %1$s."
+"Tu pote incargar un imagine de fundo pro le sito. Le dimension maximal del "
+"file es %1$s."
#: actions/designadminpanel.php:457 lib/designsettings.php:139
msgid "On"
@@ -947,16 +1130,6 @@ msgstr "Restaurar apparentias predefinite"
msgid "Reset back to default"
msgstr "Revenir al predefinitiones"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Salveguardar"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Salveguardar apparentia"
@@ -969,9 +1142,75 @@ msgstr "Iste nota non es favorite!"
msgid "Add to favorites"
msgstr "Adder al favorites"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Documento non existe."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Le documento \"%s\" non existe."
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Modificar application"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Tu debe aperir un session pro modificar un application."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Application non trovate."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Usa iste formulario pro modificar le application."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Le nomine es requirite."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Le nomine es troppo longe (max. 255 characteres)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Nomine ja in uso. Proba un altere."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Le description es requirite."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "Le URL de origine es troppo longe."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Le URL de origine non es valide."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Le organisation es requirite."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Le organisation es troppo longe (max. 255 characteres)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Le sito web del organisation es requirite."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Le reappello (callback) es troppo longe."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "Le URL de reappello (callback) non es valide."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Non poteva actualisar application."
#: actions/editgroup.php:56
#, php-format
@@ -984,7 +1223,6 @@ msgstr "Tu debe aperir un session pro crear un gruppo."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
msgstr "Tu debe esser administrator pro modificar le gruppo."
@@ -1001,7 +1239,7 @@ msgstr "description es troppo longe (max %d chars)."
msgid "Could not update group."
msgstr "Non poteva actualisar gruppo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Non poteva crear aliases."
@@ -1010,7 +1248,6 @@ msgid "Options saved."
msgstr "Optiones salveguardate."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "Configuration de e-mail"
@@ -1043,14 +1280,14 @@ msgstr ""
"spam!) pro un message con ulterior instructiones."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancellar"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "Adresses de e-mail"
+msgstr "Adresse de e-mail"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1097,7 +1334,7 @@ msgstr "Inviar me e-mail quando alcuno me invia un message private."
#: actions/emailsettings.php:174
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Inviar me e-mail quando alcuno me invia un \"@-responsa\"."
+msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1125,7 +1362,7 @@ msgid "Cannot normalize that email address"
msgstr "Non pote normalisar iste adresse de e-mail"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
@@ -1137,7 +1374,7 @@ msgstr "Isto es ja tu adresse de e-mail."
msgid "That email address already belongs to another user."
msgstr "Iste adresse de e-mail pertine ja a un altere usator."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Non poteva inserer le codice de confirmation."
@@ -1199,7 +1436,7 @@ msgstr "Iste nota es ja favorite!"
msgid "Disfavor favorite"
msgstr "Disfavorir favorite"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Notas popular"
@@ -1271,11 +1508,11 @@ msgstr "Nulle nota."
#: actions/file.php:42
msgid "No attachments."
-msgstr "Nulle attachamento."
+msgstr "Nulle annexo."
#: actions/file.php:51
msgid "No uploaded attachments."
-msgstr "Nulle attachamento cargate."
+msgstr "Nulle annexo incargate."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
@@ -1346,20 +1583,20 @@ msgstr "Le usator es ja blocate del gruppo."
msgid "User is not a member of group."
msgstr "Le usator non es membro del gruppo."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Blocar usator del gruppo"
#: actions/groupblock.php:162
-#, fuzzy, php-format
+#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
-"Es tu secur de voler blocar le usator \"%s\" del gruppo \"%s\"? Ille essera "
-"removite del gruppo, non potera publicar messages, e non potera subscriber "
-"se al gruppo in le futuro."
+"Es tu secur de voler blocar le usator \"%1$s\" del gruppo \"%2$s\"? Ille "
+"essera removite del gruppo, non potera publicar messages, e non potera "
+"subscriber se al gruppo in le futuro."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1411,11 +1648,10 @@ msgstr "Logotypo del gruppo"
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
msgstr ""
-"Tu pote cargar un imagine pro le logotypo de tu gruppo. Le dimension maxime "
-"del file es %s."
+"Tu pote incargar un imagine pro le logotypo de tu gruppo. Le dimension "
+"maximal del file es %s."
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
msgstr "Usator sin profilo correspondente"
@@ -1437,31 +1673,31 @@ msgid "%s group members"
msgstr "Membros del gruppo %s"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "Membros del gruppo %s, pagina %d"
+msgstr "Membros del gruppo %1$s, pagina %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "Un lista de usatores in iste gruppo."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blocar"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Facer le usator administrator del gruppo"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Facer administrator"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Facer iste usator administrator"
@@ -1548,7 +1784,6 @@ msgid "Error removing the block."
msgstr "Error de remover le blocada."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "Configuration de messageria instantanee"
@@ -1579,7 +1814,6 @@ msgstr ""
"message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "Adresse de messageria instantanee"
@@ -1644,6 +1878,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Isto non es tu ID de Jabber."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Cassa de entrata de %1$s - pagina %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1684,7 +1923,7 @@ msgstr "Tu es a subscribite a iste usatores:"
#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
#, php-format
msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
#: actions/invite.php:136
msgid ""
@@ -1727,7 +1966,7 @@ msgstr "Message personal"
msgid "Optionally add a personal message to the invitation."
msgstr "Si tu vole, adde un message personal al invitation."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Inviar"
@@ -1798,9 +2037,9 @@ msgid "You must be logged in to join a group."
msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s se faceva membro del gruppo %s"
+msgstr "%1$s es ora membro del gruppo %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -1811,9 +2050,9 @@ msgid "You are not a member of that group."
msgstr "Tu non es membro de iste gruppo."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s quitava le gruppo %s"
+msgstr "%1$s quitava le gruppo %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1828,7 +2067,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Error de acceder al conto de usator. Tu probabilemente non es autorisate."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aperir session"
@@ -1837,17 +2076,6 @@ msgstr "Aperir session"
msgid "Login to site"
msgstr "Identificar te a iste sito"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Pseudonymo"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contrasigno"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Memorar me"
@@ -1877,31 +2105,51 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
"Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un "
-"nomine de usator? [Registra](%%action.register%%) un nove conto."
+"nomine de usator? [Crea](%%action.register%%) un nove conto."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Solmente un administrator pote facer un altere usator administrator."
-#: actions/makeadmin.php:95
-#, fuzzy, php-format
+#: actions/makeadmin.php:96
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s es ja administrator del gruppo \"%s\"."
+msgstr "%1$s es ja administrator del gruppo \"%2$s\"."
-#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#: actions/makeadmin.php:133
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Non poteva obtener le datos del membrato de %s in le gruppo %s"
+msgstr "Non pote obtener le datos del membrato de %1$s in le gruppo %2$s."
-#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#: actions/makeadmin.php:146
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Non pote facer %s administrator del gruppo %s"
+msgstr "Non pote facer %1$s administrator del gruppo %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "Nulle stato actual"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nove application"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Tu debe aperir un session pro registrar un application."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Usa iste formulario pro registrar un nove application."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Le URL de origine es requirite."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Non poteva crear application."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nove gruppo"
@@ -1939,9 +2187,9 @@ msgid "Message sent"
msgstr "Message inviate"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "Message directe a %s inviate"
+msgstr "Message directe a %s inviate."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1969,9 +2217,9 @@ msgid "Text search"
msgstr "Recerca de texto"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Resultatos del recerca de \"%s\" in %s"
+msgstr "Resultatos del recerca de \"%1$s\" in %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -2017,6 +2265,50 @@ msgstr "Pulsata inviate"
msgid "Nudge sent!"
msgstr "Pulsata inviate!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Tu debe aperir un session pro listar tu applicationes."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Applicationes OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Applicationes que tu ha registrate"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Tu non ha ancora registrate alcun application."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Applicationes connectite"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Tu ha permittite al sequente applicationes de acceder a tu conto."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Tu non es usator de iste application."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Impossibile revocar le accesso del application: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Tu non ha autorisate alcun application a usar tu conto."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Le programmatores pote modificar le parametros de registration pro lor "
+"applicationes "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Le nota ha nulle profilo"
@@ -2034,8 +2326,8 @@ msgstr "typo de contento "
msgid "Only "
msgstr "Solmente "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2048,7 +2340,7 @@ msgid "Notice Search"
msgstr "Rercerca de notas"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Altere configurationes"
#: actions/othersettings.php:71
@@ -2080,28 +2372,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Le servicio de accurtamento de URL es troppo longe (max 50 chars)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Nulle gruppo specificate."
+msgstr "Nulle identificator de usator specificate."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Nulle nota specificate."
+msgstr "Nulle indicio de identification specificate."
#: actions/otp.php:90
msgid "No login token requested."
-msgstr ""
+msgstr "Nulle indicio de identification requestate."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Indicio invalide o expirate."
+msgstr "Indicio de identification invalide specificate."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Identificar te a iste sito"
+msgstr "Le indicio de identification ha expirate."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Cassa de exito de %1$s - pagina %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2174,7 +2467,7 @@ msgstr "Non pote salveguardar le nove contrasigno."
msgid "Password saved."
msgstr "Contrasigno salveguardate."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Camminos"
@@ -2182,133 +2475,148 @@ msgstr "Camminos"
msgid "Path and server settings for this StatusNet site."
msgstr "Configuration de cammino e servitor pro iste sito StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Directorio de thema non legibile: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Directorio de avatar non scriptibile: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Directorio de fundo non scriptibile: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Directorio de localitates non scriptibile: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr "Servitor SSL invalide. Le longitude maxime es 255 characteres."
+msgstr "Servitor SSL invalide. Le longitude maximal es 255 characteres."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Sito"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Servitor"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Nomine de host del servitor del sito."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Cammino"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Cammino del sito"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Cammino al localitates"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Cammino al directorio de localitates"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "URLs de luxo"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Thema"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Servitor de themas"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Cammino al themas"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Directorio del themas"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Servitor de avatares"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Cammino al avatares"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Directorio del avatares"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Fundos"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Servitor de fundos"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Cammino al fundos"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Directorio al fundos"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Nunquam"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Alcun vices"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Quando usar SSL"
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "Servitor SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Servitor verso le qual diriger le requestas SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Salveguardar camminos"
@@ -2331,19 +2639,20 @@ msgid "Not a valid people tag: %s"
msgstr "Etiquetta de personas invalide: %s"
#: actions/peopletag.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Usatores auto-etiquettate con %s - pagina %d"
+msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
msgstr "Le contento del nota es invalide"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Le licentia del nota '%s' non es compatibile con le licentia del sito '%s'."
+"Le licentia del nota ‘%1$s’ non es compatibile con le licentia del sito ‘%2"
+"$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2371,7 +2680,7 @@ msgid "Full name"
msgstr "Nomine complete"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina personal"
@@ -2394,7 +2703,7 @@ msgstr "Bio"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Loco"
@@ -2420,7 +2729,7 @@ msgstr ""
"Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o "
"spatios"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Lingua"
@@ -2447,7 +2756,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Bio es troppo longe (max %d chars)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Fuso horari non seligite."
@@ -2460,23 +2769,23 @@ msgstr "Lingua es troppo longe (max 50 chars)."
msgid "Invalid tag: \"%s\""
msgstr "Etiquetta invalide: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Non poteva actualisar usator pro autosubscription."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Non poteva salveguardar le preferentias de loco."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Non poteva salveguardar profilo."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Non poteva salveguardar etiquettas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Preferentias confirmate."
@@ -2498,19 +2807,19 @@ msgstr "Chronologia public, pagina %d"
msgid "Public timeline"
msgstr "Chronologia public"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Syndication del fluxo public (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Syndication del fluxo public (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Syndication del fluxo public (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2519,11 +2828,11 @@ msgstr ""
"Isto es le chronologia public pro %%site.name%%, ma nulle persona ha ancora "
"scribite alique."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Sia le prime a publicar!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2531,7 +2840,7 @@ msgstr ""
"Proque non [registrar un conto](%%action.register%%) e devenir le prime a "
"publicar?"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2544,7 +2853,7 @@ msgstr ""
"[Inscribe te ora](%%action.register%%) pro condivider notas super te con "
"amicos, familia e collegas! ([Leger plus](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2567,7 +2876,7 @@ msgstr "Istes es le etiquettas recente le plus popular in %s "
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
-"Nulle persona ha ancora publicate un nota con un [hashtag](%%doc.tags%%) yet."
+"Nulle persona ha ancora publicate un nota con un [hashtag](%%doc.tags%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -2582,7 +2891,7 @@ msgstr ""
"Proque non [registrar un conto](%%action.register%%) e devenir le prime a "
"publicar un?"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Etiquettario"
@@ -2722,10 +3031,10 @@ msgstr "Pardono, le codice de invitation es invalide."
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
-msgstr "Crear un conto"
+msgstr "Crear conto"
#: actions/register.php:135
msgid "Registration not allowed."
@@ -2733,8 +3042,7 @@ msgstr "Registration non permittite."
#: actions/register.php:198
msgid "You can't register if you don't agree to the license."
-msgstr ""
-"Tu non pote registrar te si tu non te declara de accordo con le licentia."
+msgstr "Tu non pote crear un conto si tu non accepta le licentia."
#: actions/register.php:212
msgid "Email address already exists."
@@ -2754,18 +3062,18 @@ msgstr ""
#: actions/register.php:425
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requisite."
+msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
#: actions/register.php:430
msgid "6 or more characters. Required."
-msgstr "6 o plus characteres. Requisite."
+msgstr "6 o plus characteres. Requirite."
#: actions/register.php:434
msgid "Same as password above. Required."
-msgstr "Identic al contrasigno hic supra. Requisite."
+msgstr "Identic al contrasigno hic supra. Requirite."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2781,7 +3089,7 @@ msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
#: actions/register.php:494
msgid "My text and files are available under "
-msgstr "Mi texto e files es disponibile sub "
+msgstr "Mi texto e files es disponibile sub le licentia "
#: actions/register.php:496
msgid "Creative Commons Attribution 3.0"
@@ -2796,7 +3104,7 @@ msgstr ""
"messageria instantanee, numero de telephono."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2813,9 +3121,9 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Felicitationes, %s! Benvenite a %%%%site.name%%%%. Ora tu pote...\n"
+"Felicitationes, %1$s! Benvenite a %%%%site.name%%%%. Ora tu pote...\n"
"\n"
-"* Visitar [tu profilo](%s) e publicar tu prime message.\n"
+"* Visitar [tu profilo](%2$s) e publicar tu prime message.\n"
"* Adder un [adresse Jabber/GTalk](%%%%action.imsettings%%%%) pro poter "
"inviar notas per messages instantanee.\n"
"* [Cercar personas](%%%%action.peoplesearch%%%%) que tu cognosce o con que "
@@ -2872,7 +3180,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de tu profilo in un altere servicio de microblogging compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscriber"
@@ -2910,7 +3218,7 @@ msgstr "Tu non pote repeter tu proprie nota."
msgid "You already repeated that notice."
msgstr "Tu ha ja repetite iste nota."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetite"
@@ -2924,6 +3232,11 @@ msgstr "Repetite!"
msgid "Replies to %s"
msgstr "Responsas a %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Responsas a %1$s, pagina %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2940,13 +3253,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "Syndication de responsas pro %s (Atom)"
#: actions/replies.php:198
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
-"Isto es le chronologia de responsas a %s, ma %s non ha ancora recipite alcun "
-"nota a su attention."
+"Isto es le chronologia de responsas a %1$s, ma %2$s non ha ancora recipite "
+"alcun nota a su attention."
#: actions/replies.php:203
#, php-format
@@ -2958,19 +3271,23 @@ msgstr ""
"personas o [devenir membro de gruppos](%%action.groups%%)."
#: actions/replies.php:205
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Tu pote tentar [pulsar %s](../%s) o [publicar alique a su attention](%%%%"
-"action.newnotice%%%%?status_textarea=%s)."
+"Tu pote tentar [pulsar %1$s](../%2$s) o [publicar alique a su attention](%%%%"
+"action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
msgstr "Responsas a %1$s in %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito."
@@ -2979,6 +3296,121 @@ msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito."
msgid "User is already sandboxed."
msgstr "Usator es ja in cassa de sablo."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessiones"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Parametros de session pro iste sito StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gerer sessiones"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Si nos debe gerer le sessiones nos mesme."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Cercar defectos de session"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Producer informationes technic pro cercar defectos in sessiones."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Salveguardar configurationes del sito"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Tu debe aperir un session pro vider un application."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Profilo del application"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Icone"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nomine"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organisation"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Description"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statisticas"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Create per %1$s - accesso %2$s per predefinition - %3$d usatores"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Actiones de application"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Reinitialisar clave e secreto"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Info del application"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Clave de consumitor"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Secreto de consumitor"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL del indicio de requesta"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL del indicio de accesso"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "URL de autorisation"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Nota: Nos supporta le signaturas HMAC-SHA1. Nos non accepta signaturas in "
+"texto simple."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Es tu secur de voler reinitialisar tu clave e secreto de consumitor?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Notas favorite de %1$s, pagina %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Non poteva recuperar notas favorite."
@@ -3036,17 +3468,22 @@ msgstr "Isto es un modo de condivider lo que te place."
msgid "%s group"
msgstr "Gruppo %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Gruppo %1$s, pagina %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Profilo del gruppo"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Nota"
@@ -3092,10 +3529,6 @@ msgstr "(Nulle)"
msgid "All members"
msgstr "Tote le membros"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statisticas"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Create"
@@ -3159,10 +3592,15 @@ msgstr "Nota delite."
msgid " tagged %s"
msgstr " con etiquetta %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, pagina %2$d"
+
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Syndication de notas pro %s con etiquetta %s (RSS 1.0)"
+msgstr "Syndication de notas pro %1$s con etiquetta %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
@@ -3184,12 +3622,13 @@ msgstr "Syndication de notas pro %s (Atom)"
msgid "FOAF for %s"
msgstr "Amico de un amico pro %s"
-#: actions/showstream.php:191
-#, fuzzy, php-format
+#: actions/showstream.php:200
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "Isto es le chronologia pro %s, ma %s non ha ancora publicate alique."
+msgstr ""
+"Isto es le chronologia pro %1$s, ma %2$s non ha ancora publicate alique."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3197,16 +3636,16 @@ msgstr ""
"Videva tu qualcosa de interessante recentemente? Tu non ha ancora publicate "
"alcun nota, dunque iste es un bon momento pro comenciar :)"
-#: actions/showstream.php:198
-#, fuzzy, php-format
+#: actions/showstream.php:207
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"Tu pote tentar pulsar %s o [publicar un nota a su attention](%%%%action."
-"newnotice%%%%?status_textarea=%s)."
+"Tu pote tentar pulsar %1$s o [publicar un nota a su attention](%%%%action."
+"newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3220,7 +3659,7 @@ msgstr ""
"pro sequer le notas de **%s** e multe alteres! ([Lege plus](%%%%doc.help%%%"
"%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3231,7 +3670,7 @@ msgstr ""
"(http://en.wikipedia.org/wiki/Microblog) a base del software libere "
"[StatusNet](http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Repetition de %s"
@@ -3248,202 +3687,148 @@ msgstr "Usator es ja silentiate."
msgid "Basic settings for this StatusNet site."
msgstr "Configurationes de base pro iste sito de StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Le longitude del nomine del sito debe esser plus que zero."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Tu debe haber un valide adresse de e-mail pro contacto."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Lingua \"%s\" incognite"
+msgstr "Lingua \"%s\" incognite."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "Le URL pro reportar instantaneos es invalide."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Valor de execution de instantaneo invalide."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "Le frequentia de instantaneos debe esser un numero."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
-msgstr "Le limite minime del texto es 140 characteres."
+msgstr "Le limite minimal del texto es 140 characteres."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "Le limite de duplicatos debe esser 1 o plus secundas."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "General"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Nomine del sito"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Le nomine de tu sito, como \"Le microblog de TuCompania\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Realisate per"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Le texto usate pro le ligamine al creditos in le pede de cata pagina"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URL pro \"Realisate per\""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL usate pro le ligamine al creditos in le pede de cata pagina"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Le adresse de e-mail de contacto pro tu sito"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Local"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Fuso horari predefinite"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horari predefinite pro le sito; normalmente UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Lingua predefinite del sito"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URLs"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Servitor"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Nomine de host del servitor del sito."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "URLs de luxo"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Accesso"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Private"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Prohiber al usatores anonyme (sin session aperte) de vider le sito?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Solmente per invitation"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Permitter le registration solmente al invitatos."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Claudite"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Disactivar le creation de nove contos."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Instantaneos"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Aleatorimente durante un accesso web"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "In un processo planificate"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Instantaneos de datos"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Quando inviar datos statistic al servitores de status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frequentia"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Un instantaneo essera inviate a cata N accessos web"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL pro reporto"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Le instantaneos essera inviate a iste URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limites"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Limite de texto"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
-msgstr "Numero maxime de characteres pro notas."
+msgstr "Numero maximal de characteres pro notas."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Limite de duplicatos"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Quante tempore (in secundas) le usatores debe attender ante de poter "
"publicar le mesme cosa de novo."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Salveguardar configurationes del sito"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "Configuration SMS"
+msgstr "Parametros de SMS"
#: actions/smssettings.php:69
#, php-format
@@ -3471,7 +3856,6 @@ msgid "Enter the code you received on your phone."
msgstr "Entra le codice que tu ha recipite in tu telephono."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Numero de telephono pro SMS"
@@ -3545,15 +3929,26 @@ msgstr "Nulle codice entrate"
msgid "You are not subscribed to that profile."
msgstr "Tu non es subscribite a iste profilo."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Non poteva salveguardar le subscription."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Le usator non es local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "File non existe."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Tu non es subscribite a iste profilo."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscribite"
@@ -3563,9 +3958,9 @@ msgid "%s subscribers"
msgstr "Subscriptores a %s"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "Subscriptores a %s, pagina %d"
+msgstr "Subscriptores a %1$s, pagina %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3587,7 +3982,7 @@ msgstr ""
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s non ha subscriptores. Vole esser le prime?"
#: actions/subscribers.php:114
#, php-format
@@ -3595,27 +3990,29 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s non ha subscriptores. Proque non [crear un conto](%%%%action.register%%%"
+"%) e esser le prime?"
#: actions/subscriptions.php:52
#, php-format
msgid "%s subscriptions"
-msgstr ""
+msgstr "Subscriptiones de %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "Subscriptores a %s, pagina %d"
+msgstr "Subscriptiones de %1$s, pagina %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Tu seque le notas de iste personas."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "%s seque le notas de iste personas."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3624,34 +4021,45 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Tu non seque le notas de alcuno in iste momento. Tenta subscriber te a "
+"personas que tu cognosce. Proba [le recerca de personas](%%action."
+"peoplesearch%%), cerca membros in le gruppos de tu interesse e in le "
+"[usatores in evidentia](%%action.featured%%). Si tu es [usator de Twitter](%%"
+"action.twittersettings%%), tu pote automaticamente subscriber te a personas "
+"que tu ja seque la."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr ""
+msgstr "%s non seque alcuno."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "SMS"
+
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Notas etiquettate con %1$s, pagina %2$d"
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Syndication de notas pro le etiquetta %s (RSS 1.0)"
#: actions/tag.php:92
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Syndication de notas pro le etiquetta %s (RSS 2.0)"
#: actions/tag.php:98
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "Syndication de notas pro le etiquetta %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
@@ -3660,164 +4068,151 @@ msgstr "Nulle parametro de ID."
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "Etiquetta %s"
#: actions/tagother.php:77 lib/userprofile.php:75
msgid "User profile"
-msgstr ""
+msgstr "Profilo del usator"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
-msgstr ""
+msgstr "Photo"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Etiquettar usator"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Etiquettas pro iste usator (litteras, numeros, -, . e _), separate per "
+"commas o spatios"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+"Tu pote solmente etiquettar personas a qui tu es subscribite o qui es "
+"subscribite a te."
#: actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "Non poteva salveguardar etiquettas."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+"Usa iste formulario pro adder etiquettas a tu subscriptores o subscriptiones."
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr ""
+msgstr "Etiquetta non existe."
#: actions/twitapitrends.php:87
msgid "API method under construction."
-msgstr ""
+msgstr "Methodo API in construction."
#: actions/unblock.php:59
msgid "You haven't blocked that user."
-msgstr ""
+msgstr "Tu non ha blocate iste usator."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
-msgstr ""
+msgstr "Le usator non es in le cassa de sablo."
#: actions/unsilence.php:72
msgid "User is not silenced."
-msgstr ""
+msgstr "Le usator non es silentiate."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
-msgstr ""
+msgstr "Nulle ID de profilo in requesta."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "Subscription cancellate"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
-#, fuzzy, php-format
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
+#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Le licentia del nota '%s' non es compatibile con le licentia del sito '%s'."
+"Le licentia del fluxo que tu ascolta, ‘%1$s’, non es compatibile con le "
+"licentia del sito ‘%2$s’."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
msgid "User"
-msgstr ""
+msgstr "Usator"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Configurationes de usator pro iste sito de StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Limite de biographia invalide. Debe esser un numero."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Texto de benvenita invalide. Longitude maximal es 255 characteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Subscription predefinite invalide: '%1$s' non es usator."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
-msgstr ""
+msgstr "Profilo"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
-msgstr ""
+msgstr "Limite de biographia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Le longitude maximal del biographia de un profilo in characteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
-msgstr ""
+msgstr "Nove usatores"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
-msgstr ""
+msgstr "Message de benvenita a nove usatores"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Texto de benvenita pro nove usatores (max. 255 characteres)"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
-msgstr ""
+msgstr "Subscription predefinite"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
-msgstr ""
+msgstr "Subscriber automaticamente le nove usatores a iste usator."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
-msgstr ""
+msgstr "Invitationes"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
-msgstr ""
+msgstr "Invitationes activate"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
-msgstr ""
-
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Si le usatores pote invitar nove usatores."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "Autorisar subscription"
#: actions/userauthorization.php:110
msgid ""
@@ -3825,121 +4220,137 @@ msgid ""
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Rejectâ€."
msgstr ""
+"Per favor verifica iste detalios pro assecurar te que tu vole subscriber te "
+"al notas de iste usator. Si tu non ha requestate isto, clicca \"Rejectar\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
-msgstr ""
+msgstr "Licentia"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
-msgstr ""
+msgstr "Acceptar"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr ""
+msgstr "Subscriber me a iste usator"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
-msgstr ""
+msgstr "Rejectar"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
-msgstr ""
+msgstr "Rejectar iste subscription"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "Nulle requesta de autorisation!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
-msgstr ""
+msgstr "Subscription autorisate"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
+"Le subscription ha essite autorisate, ma nulle URL de retorno ha essite "
+"recipite. Lege in le instructiones del sito in question como autorisar le "
+"subscription. Tu indicio de subscription es:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
-msgstr ""
+msgstr "Subscription rejectate"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
+"Le subscription ha essite rejectate, ma nulle URL de retorno ha essite "
+"recipite. Lege in le instructiones del sito in question como rejectar "
+"completemente le subscription."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "URI de ascoltator ‘%s’ non trovate hic."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "URI de ascoltato ‘%s’ es troppo longe."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "URI de ascoltato ‘%s’ es un usator local."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "URL de profilo ‘%s’ es de un usator local."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "URL de avatar ‘%s’ non es valide."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "Non pote leger URL de avatar ‘%s’."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "Typo de imagine incorrecte pro URL de avatar ‘%s’."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr ""
+msgstr "Apparentia del profilo"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personalisa le apparentia de tu profilo con un imagine de fundo e un paletta "
+"de colores de tu preferentia."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Bon appetito!"
+
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Gruppos %1$s, pagina %2$d"
#: actions/usergroups.php:130
msgid "Search for more groups"
-msgstr ""
+msgstr "Cercar altere gruppos"
#: actions/usergroups.php:153
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "%s non es membro de alcun gruppo."
#: actions/usergroups.php:158
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
+"Tenta [cercar gruppos](%%action.groupsearch%%) e facer te membro de illos."
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "Statisticas"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -3947,15 +4358,12 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Stato delite."
+"Iste sito es realisate per %1$s version %2$s, copyright 2008-2010 StatusNet, "
+"Inc. e contributores."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Contributores"
#: actions/version.php:168
msgid ""
@@ -3964,6 +4372,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet es software libere: vos pote redistribuer lo e/o modificar lo sub "
+"le conditiones del GNU Affero General Public License como publicate per le "
+"Free Software Foundation, o version 3 de iste licentia, o (a vostre "
+"election) omne version plus recente. "
#: actions/version.php:174
msgid ""
@@ -3972,6 +4384,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Iste programma es distribuite in le sperantia que illo essera utile, ma SIN "
+"ALCUN GARANTIA; sin mesmo le garantia implicite de COMMERCIABILITATE o de "
+"USABILITATE PRO UN PARTICULAR SCOPO. Vide le GNU Affero General Public "
+"License pro ulterior detalios. "
#: actions/version.php:180
#, php-format
@@ -3979,28 +4395,20 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Un copia del GNU Affero General Public License deberea esser disponibile "
+"insimul con iste programma. Si non, vide %s."
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
+msgstr "Plug-ins"
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Pseudonymo"
-
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "Conversation"
+msgstr "Version"
#: actions/version.php:197
msgid "Author(s)"
-msgstr ""
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
+msgstr "Autor(es)"
#: classes/File.php:144
#, php-format
@@ -4008,402 +4416,541 @@ msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Nulle file pote esser plus grande que %d bytes e le file que tu inviava ha %"
+"d bytes. Tenta incargar un version minus grande."
#: classes/File.php:154
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgstr "Un file de iste dimension excederea tu quota de usator de %d bytes."
#: classes/File.php:161
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Un file de iste dimension excederea tu quota mensual de %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Profilo del gruppo"
+msgstr "Le inscription al gruppo ha fallite."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Non poteva actualisar gruppo."
+msgstr "Non es membro del gruppo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Profilo del gruppo"
+msgstr "Le cancellation del membrato del gruppo ha fallite."
#: classes/Login_token.php:76
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Non poteva crear aliases."
+msgstr "Non poteva crear indicio de identification pro %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
-msgstr ""
+msgstr "Il te es prohibite inviar messages directe."
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Non poteva inserer message."
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Non poteva actualisar message con nove URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Problema salveguardar nota. Troppo longe."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Problema salveguardar nota. Usator incognite."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
+"Troppo de notas troppo rapidemente; face un pausa e publica de novo post "
+"alcun minutas."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
+"Troppo de messages duplicate troppo rapidemente; face un pausa e publica de "
+"novo post alcun minutas."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Il te es prohibite publicar notas in iste sito."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
-msgstr ""
+msgstr "Problema salveguardar nota."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Problema salveguardar le cassa de entrata del gruppo."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "RT @%1$s %2$s"
+
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Tu ha essite blocate del subscription."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Ja subscribite!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Le usator te ha blocate."
-#: classes/User.php:382
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Non subscribite!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Non poteva deler auto-subscription."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Non poteva deler subscription."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Benvenite a %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
-msgstr ""
+msgstr "Non poteva crear gruppo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
-msgstr ""
+msgstr "Non poteva configurar le membrato del gruppo."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
-msgstr ""
+msgstr "Cambiar le optiones de tu profilo"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr ""
+msgstr "Incargar un avatar"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
-msgstr ""
+msgstr "Cambiar tu contrasigno"
#: lib/accountsettingsaction.php:120
msgid "Change email handling"
-msgstr ""
+msgstr "Modificar le tractamento de e-mail"
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
-msgstr ""
+msgstr "Designar tu profilo"
#: lib/accountsettingsaction.php:128
msgid "Other"
-msgstr ""
+msgstr "Altere"
#: lib/accountsettingsaction.php:128
msgid "Other options"
-msgstr ""
+msgstr "Altere optiones"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%s quitava le gruppo %s"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
-msgstr ""
+msgstr "Pagina sin titulo"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
-msgstr ""
+msgstr "Navigation primari del sito"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
-msgstr ""
+msgstr "Initio"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
-msgstr ""
-
-#: lib/action.php:435
-msgid "Account"
-msgstr ""
+msgstr "Profilo personal e chronologia de amicos"
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
-msgstr ""
+msgstr "Connecter"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
-msgstr ""
+msgstr "Connecter con servicios"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
-msgstr ""
+msgstr "Modificar le configuration del sito"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
-msgstr ""
+msgstr "Invitar"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Invitar amicos e collegas a accompaniar te in %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
-msgstr ""
+msgstr "Clauder session"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
-msgstr ""
+msgstr "Terminar le session del sito"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
-msgstr ""
+msgstr "Crear un conto"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
-msgstr ""
+msgstr "Identificar te a iste sito"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
-msgstr ""
+msgstr "Adjuta"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
-msgstr ""
+msgstr "Adjuta me!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
-msgstr ""
+msgstr "Cercar"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
-msgstr ""
+msgstr "Cercar personas o texto"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
-msgstr ""
+msgstr "Aviso del sito"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
-msgstr ""
+msgstr "Vistas local"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
-msgstr ""
+msgstr "Aviso de pagina"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
-msgstr ""
+msgstr "Navigation secundari del sito"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
-msgstr ""
+msgstr "A proposito"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
-msgstr ""
+msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
-msgstr ""
+msgstr "CdS"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
-msgstr ""
+msgstr "Confidentialitate"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
-msgstr ""
+msgstr "Fonte"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
-msgstr ""
+msgstr "Contacto"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
-msgstr ""
+msgstr "Insignia"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
-msgstr ""
+msgstr "Licentia del software StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
+"**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%"
+"%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
+msgstr "**%%site.name%%** es un servicio de microblog. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"Le sito functiona con le software de microblog [StatusNet](http://status."
+"net/), version %s, disponibile sub le [GNU Affero General Public License]"
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
+msgstr "Licentia del contento del sito"
+
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Le contento e datos de %1$s es private e confidential."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Contento e datos sub copyright del contributores. Tote le derectos reservate."
-#: lib/action.php:803
+#: lib/action.php:827
msgid "All "
-msgstr ""
+msgstr "Totes "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
-msgstr ""
+msgstr "licentia."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
-msgstr ""
+msgstr "Pagination"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
-msgstr ""
+msgstr "Post"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
+msgstr "Ante"
+
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
msgstr ""
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Tu non pote facer modificationes in iste sito."
#: lib/adminpanelaction.php:107
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "Registration non permittite."
+msgstr "Le modification de iste pannello non es permittite."
#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() non implementate."
#: lib/adminpanelaction.php:235
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() non implementate."
#: lib/adminpanelaction.php:258
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Impossibile deler configuration de apparentia."
#: lib/adminpanelaction.php:312
msgid "Basic site configuration"
-msgstr ""
+msgstr "Configuration basic del sito"
#: lib/adminpanelaction.php:317
msgid "Design configuration"
-msgstr ""
+msgstr "Configuration del apparentia"
+
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Configuration del usator"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Configuration del accesso"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
+msgstr "Configuration del camminos"
+
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Configuration del sessiones"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"Le ressource de API require accesso pro lectura e scriptura, ma tu ha "
+"solmente accesso pro lectura."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"Tentativa de authentication al API fallite, pseudonymo = %1$s, proxy = %2$s, "
+"IP = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Modificar application"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Icone pro iste application"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Describe tu application in %d characteres"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Describe tu application"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL de origine"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL del pagina initial de iste application"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organisation responsabile de iste application"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL del pagina initial del organisation"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL verso le qual rediriger post authentication"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Navigator"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Scriptorio"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Typo de application, navigator o scriptorio"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Lectura solmente"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Lectura e scriptura"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Accesso predefinite pro iste application: lectura solmente, o lectura e "
+"scriptura"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Revocar"
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Annexos"
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#: lib/attachmentlist.php:278
msgid "Provider"
-msgstr ""
+msgstr "Providitor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Notas ubi iste annexo appare"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Etiquettas pro iste annexo"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
-#, fuzzy
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
-msgstr "Cambio del contrasigno"
+msgstr "Cambio del contrasigno fallite"
-#: lib/authenticationplugin.php:197
-#, fuzzy
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
-msgstr "Cambio del contrasigno"
+msgstr "Cambio del contrasigno non permittite"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
-msgstr ""
+msgstr "Resultatos del commando"
#: lib/channel.php:210 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Commando complete"
#: lib/channel.php:221
msgid "Command failed"
-msgstr ""
+msgstr "Commando fallite"
#: lib/command.php:44
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Pardono, iste commando non es ancora implementate."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Non poteva trovar le usator de destination."
+msgstr "Non poteva trovar un usator con pseudonymo %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Non ha multe senso pulsar te mesme!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Pulsata inviate"
+msgstr "Pulsata inviate a %s"
#: lib/command.php:126
#, php-format
@@ -4412,21 +4959,22 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Subscriptiones: %1$s\n"
+"Subscriptores: %2$s\n"
+"Notas: %3$s"
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator."
+msgstr "Non existe un nota con iste ID"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
-#, fuzzy
msgid "User has no last notice"
-msgstr "Le usator non ha un profilo."
+msgstr "Usator non ha ultime nota"
#: lib/command.php:190
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Nota marcate como favorite."
#: lib/command.php:217
msgid "You are already a member of that group"
@@ -4453,29 +5001,29 @@ msgid "%s left group %s"
msgstr "%s quitava le gruppo %s"
#: lib/command.php:309
-#, fuzzy, php-format
+#, php-format
msgid "Fullname: %s"
-msgstr "Nomine complete"
+msgstr "Nomine complete: %s"
#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Loco: %s"
#: lib/command.php:315 lib/mail.php:256
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Pagina personal: %s"
#: lib/command.php:318
#, php-format
msgid "About: %s"
-msgstr ""
+msgstr "A proposito: %s"
#: lib/command.php:349
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "Message troppo longe - maximo es %d characteres, tu inviava %d"
#: lib/command.php:367
#, php-format
@@ -4484,7 +5032,7 @@ msgstr "Message directe a %s inviate"
#: lib/command.php:369
msgid "Error sending direct message."
-msgstr ""
+msgstr "Error durante le invio del message directe."
#: lib/command.php:413
msgid "Cannot repeat your own notice"
@@ -4495,9 +5043,9 @@ msgid "Already repeated that notice"
msgstr "Iste nota ha ja essite repetite"
#: lib/command.php:426
-#, fuzzy, php-format
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Nota delite."
+msgstr "Nota de %s repetite"
#: lib/command.php:428
msgid "Error repeating notice."
@@ -4506,95 +5054,107 @@ msgstr "Error durante le repetition del nota."
#: lib/command.php:482
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d"
#: lib/command.php:491
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Responsas a %s"
+msgstr "Responsa a %s inviate"
#: lib/command.php:493
msgid "Error saving notice."
-msgstr ""
+msgstr "Errur durante le salveguarda del nota."
#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Specifica le nomine del usator al qual subscriber te"
+
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Usator non existe"
-#: lib/command.php:554
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "Subscribite a %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Specifica le nomine del usator al qual cancellar le subscription"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Subscription a %s cancellate"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
-msgstr ""
+msgstr "Commando non ancora implementate."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
-msgstr ""
+msgstr "Notification disactivate."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
-msgstr ""
+msgstr "Non pote disactivar notification."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
-msgstr ""
+msgstr "Notification activate."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
-msgstr ""
+msgstr "Non pote activar notification."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
-msgstr ""
+msgstr "Le commando de apertura de session es disactivate"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"Iste ligamine pote esser usate solmente un vice, e es valide durante "
+"solmente 2 minutas: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Subscription a %s cancellate"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
-msgstr ""
+msgstr "Tu non es subscribite a alcuno."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tu es subscribite a iste persona:"
+msgstr[1] "Tu es subscribite a iste personas:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
-msgstr ""
+msgstr "Necuno es subscribite a te."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Iste persona es subscribite a te:"
+msgstr[1] "Iste personas es subscribite a te:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "Tu non es membro de alcun gruppo."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tu es membro de iste gruppo:"
+msgstr[1] "Tu es membro de iste gruppos:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4608,6 +5168,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4634,246 +5195,295 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
-
-#: lib/common.php:131
+"Commandos:\n"
+"on - activar notificationes\n"
+"off - disactivar notificationes\n"
+"help - monstrar iste adjuta\n"
+"follow <pseudonymo> - subscriber te al usator\n"
+"groups - listar le gruppos del quales tu es membro\n"
+"subscriptions - listar le personas que tu seque\n"
+"subscribers - listar le personas qui te seque\n"
+"leave <pseudonymo> - cancellar subscription al usator\n"
+"d <pseudonymo> <texto> - diriger message al usator\n"
+"get <pseudonymo> - obtener ultime nota del usator\n"
+"whois <pseudonymo> - obtener info de profilo del usator\n"
+"fav <pseudonymo> - adder ultime nota del usator como favorite\n"
+"fav #<id_de_nota> - adder nota con le ID date como favorite\n"
+"repeat #<id_de_nota> - repeter le nota con le ID date\n"
+"repeat <pseudonymo> - repeter le ultime nota del usator\n"
+"reply #<id_de_nota> - responder al nota con le ID date\n"
+"reply <pseudonymo> - responder al ultime nota del usator\n"
+"join <gruppo> - facer te membro del gruppo\n"
+"login - obtener ligamine pro aperir session al interfacie web\n"
+"drop <gruppo> - quitar gruppo\n"
+"stats - obtener tu statisticas\n"
+"stop - como 'off'\n"
+"quit - como 'off'\n"
+"sub <pseudonymo> - como 'follow'\n"
+"unsub <pseudonymo> - como 'leave'\n"
+"last <pseudonymo> - como 'get'\n"
+"on <pseudonymo> - non ancora implementate.\n"
+"off <pseudonymo> - non ancora implementate.\n"
+"nudge <pseudonymo> - rememorar un usator de scriber alique.\n"
+"invite <numero de telephono> - non ancora implementate.\n"
+"track <parola> - non ancora implementate.\n"
+"untrack <parola> - non ancora implementate.\n"
+"track off - non ancora implementate.\n"
+"untrack all - non ancora implementate.\n"
+"tracks - non ancora implementate.\n"
+"tracking - non ancora implementate.\n"
+
+#: lib/common.php:136
msgid "No configuration file found. "
-msgstr ""
+msgstr "Nulle file de configuration trovate. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Io cercava files de configuration in le sequente locos: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Considera executar le installator pro reparar isto."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
-msgstr ""
+msgstr "Ir al installator."
#: lib/connectsettingsaction.php:110
msgid "IM"
-msgstr ""
+msgstr "MI"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Actualisationes per messageria instantanee (MI)"
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Actualisationes per SMS"
+
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Connexiones"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Applicationes autorisate connectite"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Error de base de datos"
#: lib/designsettings.php:105
msgid "Upload file"
-msgstr ""
+msgstr "Incargar file"
#: lib/designsettings.php:109
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Tu pote actualisar tu imagine de fundo personal. Le dimension maximal del "
+"file es 2MB."
#: lib/designsettings.php:418
msgid "Design defaults restored."
-msgstr ""
+msgstr "Apparentia predefinite restaurate."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr ""
+msgstr "Disfavorir iste nota"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr ""
+msgstr "Favorir iste nota"
#: lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "Favorir"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "Amico de un amico"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Exportar datos"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr ""
+msgstr "Filtrar etiquettas"
#: lib/galleryaction.php:131
msgid "All"
-msgstr ""
+msgstr "Totes"
#: lib/galleryaction.php:139
msgid "Select tag to filter"
-msgstr ""
+msgstr "Selige etiquetta a filtrar"
#: lib/galleryaction.php:140
msgid "Tag"
-msgstr ""
+msgstr "Etiquetta"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Selige etiquetta pro reducer lista"
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "Ir"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+msgstr "URL del pagina initial o blog del gruppo o topico"
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr ""
+msgstr "Describe le gruppo o topico"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "Describe le gruppo o topico in %d characteres"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
msgstr ""
+"Loco del gruppo, si existe, como \"Citate, Provincia (o Region), Pais\""
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Pseudonymos additional pro le gruppo, separate per commas o spatios, max %d"
#: lib/groupnav.php:85
msgid "Group"
-msgstr ""
+msgstr "Gruppo"
#: lib/groupnav.php:101
msgid "Blocked"
-msgstr ""
+msgstr "Blocate"
#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
-msgstr ""
+msgstr "%s usatores blocate"
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Modificar proprietates del gruppo %s"
#: lib/groupnav.php:113
msgid "Logo"
-msgstr ""
+msgstr "Logotypo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Adder o modificar logotypo de %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Adder o modificar apparentia de %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr ""
+msgstr "Gruppos con le plus membros"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr ""
+msgstr "Gruppos con le plus messages"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Etiquettas in le notas del gruppo %s"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "Iste pagina non es disponibile in un formato que tu accepta"
#: lib/imagefile.php:75
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Iste file es troppo grande. Le dimension maximal es %s."
#: lib/imagefile.php:80
msgid "Partial upload."
-msgstr ""
+msgstr "Incargamento partial."
#: lib/imagefile.php:88 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr ""
+msgstr "Error de systema durante le incargamento del file."
#: lib/imagefile.php:96
msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "Le file non es un imagine o es defecte."
#: lib/imagefile.php:105
msgid "Unsupported image file format."
-msgstr ""
+msgstr "Formato de file de imagine non supportate."
#: lib/imagefile.php:118
msgid "Lost our file."
-msgstr ""
+msgstr "File perdite."
#: lib/imagefile.php:150 lib/imagefile.php:197
msgid "Unknown file type"
-msgstr ""
+msgstr "Typo de file incognite"
#: lib/imagefile.php:217
msgid "MB"
-msgstr ""
+msgstr "MB"
#: lib/imagefile.php:219
msgid "kB"
-msgstr ""
+msgstr "KB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Lingua \"%s\" incognite"
+msgstr "Fonte de cassa de entrata \"%s\" incognite"
#: lib/joinform.php:114
msgid "Join"
-msgstr ""
+msgstr "Inscriber"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr ""
+msgstr "Quitar"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
-msgstr ""
+msgstr "Aperir session con nomine de usator e contrasigno"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr ""
+msgstr "Crear un nove conto"
#: lib/mail.php:172
msgid "Email address confirmation"
-msgstr ""
+msgstr "Confirmation del adresse de e-mail"
#: lib/mail.php:174
#, php-format
@@ -4891,11 +5501,23 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Salute %s,\n"
+"\n"
+"Alcuno entrava ante un momento iste adresse de e-mail in %s.\n"
+"\n"
+"Si isto esseva tu, e tu vole confirmar le adresse, usa le URL hic infra:\n"
+"\n"
+"%s\n"
+"\n"
+"Si non, simplemente ignora iste message.\n"
+"\n"
+"Gratias pro tu attention,\n"
+"%s\n"
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s seque ora tu notas in %2$s."
#: lib/mail.php:241
#, php-format
@@ -4911,16 +5533,26 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s seque ora tu notas in %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Cordialmente,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Cambia tu adresse de e-mail o optiones de notification a %8$s\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr "Bio"
+msgstr "Bio: %s"
#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Nove adresse de e-mail pro publicar in %s"
#: lib/mail.php:289
#, php-format
@@ -4934,20 +5566,28 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
+"Tu ha un nove adresse pro publication in %1$s.\n"
+"\n"
+"Invia e-mail a %2$s pro publicar nove messages.\n"
+"\n"
+"Ulterior informationes se trova a %3$s.\n"
+"\n"
+"Cordialmente,\n"
+"%4$s"
#: lib/mail.php:413
#, php-format
msgid "%s status"
-msgstr ""
+msgstr "Stato de %s"
#: lib/mail.php:439
msgid "SMS confirmation"
-msgstr ""
+msgstr "Confirmation SMS"
#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
-msgstr ""
+msgstr "%s te ha pulsate"
#: lib/mail.php:467
#, php-format
@@ -4964,11 +5604,22 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) se demanda lo que tu face iste dies e te invita a scriber alique "
+"de nove.\n"
+"\n"
+"Dunque face audir de te :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Non responde a iste message; le responsa non arrivara.\n"
+"\n"
+"Con salutes cordial,\n"
+"%4$s\n"
#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
-msgstr ""
+msgstr "Nove message private de %s"
#: lib/mail.php:514
#, php-format
@@ -4988,11 +5639,25 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) te ha inviate un message private:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Tu pote responder a su message hic:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Non responde per e-mail; le responsa non arrivara.\n"
+"\n"
+"Con salutes cordial,\n"
+"%5$s\n"
#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
+msgstr "%s (@%s) ha addite tu nota como favorite"
#: lib/mail.php:561
#, php-format
@@ -5014,11 +5679,28 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) addeva ante un momento tu nota de %2$s como un de su "
+"favorites.\n"
+"\n"
+"Le URL de tu nota es:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Le texto de tu nota es:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Tu pote vider le lista del favorites de %1$s hic:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Cordialmente,\n"
+"%6$s\n"
#: lib/mail.php:624
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) ha inviate un nota a tu attention"
#: lib/mail.php:626
#, php-format
@@ -5034,549 +5716,531 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) inviava ante un momento un nota a tu attention (un 'responsa "
+"@') in %2$s.\n"
+"\n"
+"Le nota es hic:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Le texto:\n"
+"\n"
+"%4$s\n"
+"\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Solmente le usator pote leger su proprie cassas postal."
#: lib/mailbox.php:139
msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"Tu non ha messages private. Tu pote inviar messages private pro ingagiar "
+"altere usatores in conversation. Altere personas pote inviar te messages que "
+"solmente tu pote leger."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
-msgstr ""
+msgstr "de"
#: lib/mailhandler.php:37
msgid "Could not parse message."
-msgstr ""
+msgstr "Non comprendeva le syntaxe del message."
#: lib/mailhandler.php:42
msgid "Not a registered user."
-msgstr ""
+msgstr "Non un usator registrate."
#: lib/mailhandler.php:46
msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Pardono, isto non es tu adresse de e-mail entrante."
#: lib/mailhandler.php:50
msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Pardono, le reception de e-mail non es permittite."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Formato non supportate."
+msgstr "Typo de message non supportate: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Un error de base de datos occurreva durante le salveguarda de tu file. Per "
+"favor reproba."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "Le file incargate excede le directiva upload_max_filesize in php.ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"Le file incargate excede le directiva MAX_FILE_SIZE specificate in le "
+"formulario HTML."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Le file incargate ha solmente essite incargate partialmente."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Manca un dossier temporari."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Falleva de scriber le file in disco."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Incargamento de file stoppate per un extension."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "File excede quota del usator."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "File non poteva esser displaciate in le directorio de destination."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Non poteva determinar le usator de origine."
+msgstr "Non poteva determinar le typo MIME del file."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr " Tenta usar un altere formato %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "%s non es un typo de file supportate in iste servitor."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "Inviar un nota directe"
#: lib/messageform.php:146
msgid "To"
-msgstr ""
+msgstr "A"
#: lib/messageform.php:159 lib/noticeform.php:185
msgid "Available characters"
-msgstr ""
+msgstr "Characteres disponibile"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr ""
+msgstr "Inviar un nota"
#: lib/noticeform.php:173
#, php-format
msgid "What's up, %s?"
-msgstr ""
+msgstr "Como sta, %s?"
#: lib/noticeform.php:192
msgid "Attach"
-msgstr ""
+msgstr "Annexar"
#: lib/noticeform.php:196
msgid "Attach a file"
-msgstr ""
+msgstr "Annexar un file"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Non poteva salveguardar le preferentias de loco."
+msgstr "Divulgar mi loco"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Non poteva salveguardar le preferentias de loco."
+msgstr "Non divulgar mi loco"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Pardono, le obtention de tu geolocalisation prende plus tempore que "
+"previste. Per favor reproba plus tarde."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
-msgstr ""
+msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
-msgstr ""
+msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
-msgstr ""
+msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
-msgstr ""
+msgstr "W"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
-msgstr ""
+msgstr "a"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
-msgstr ""
+msgstr "in contexto"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetite per"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
-msgstr ""
+msgstr "Responder a iste nota"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
-msgstr ""
+msgstr "Responder"
-#: lib/noticelist.php:628
-#, fuzzy
+#: lib/noticelist.php:655
msgid "Notice repeated"
-msgstr "Nota delite."
+msgstr "Nota repetite"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr ""
+msgstr "Pulsar iste usator"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "Pulsar"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Inviar un pulsata a iste usator"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
-msgstr ""
+msgstr "Error durante le insertion del nove profilo"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "Error durante le insertion del avatar"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
-msgstr ""
+msgstr "Error durante le insertion del profilo remote"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr ""
+msgstr "Duplicar nota"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Non poteva inserer nove subscription."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr ""
+msgstr "Personal"
#: lib/personalgroupnav.php:104
msgid "Replies"
-msgstr ""
+msgstr "Responsas"
#: lib/personalgroupnav.php:114
msgid "Favorites"
-msgstr ""
+msgstr "Favorites"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
-msgstr ""
+msgstr "Cassa de entrata"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
-msgstr ""
+msgstr "Tu messages recipite"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
-msgstr ""
+msgstr "Cassa de exito"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
-msgstr ""
+msgstr "Tu messages inviate"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Etiquettas in le notas de %s"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "Action incognite"
+msgstr "Incognite"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
-msgstr ""
+msgstr "Subscriptiones"
#: lib/profileaction.php:126
msgid "All subscriptions"
-msgstr ""
+msgstr "Tote le subscriptiones"
#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
-msgstr ""
+msgstr "Subscriptores"
#: lib/profileaction.php:157
msgid "All subscribers"
-msgstr ""
+msgstr "Tote le subscriptores"
#: lib/profileaction.php:178
msgid "User ID"
-msgstr ""
+msgstr "ID del usator"
#: lib/profileaction.php:183
msgid "Member since"
-msgstr ""
+msgstr "Membro depost"
#: lib/profileaction.php:245
msgid "All groups"
-msgstr ""
+msgstr "Tote le gruppos"
#: lib/profileformaction.php:123
msgid "No return-to arguments."
-msgstr ""
+msgstr "Nulle parametro return-to."
#: lib/profileformaction.php:137
msgid "Unimplemented method."
-msgstr ""
+msgstr "Methodo non implementate."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr ""
+msgstr "Public"
#: lib/publicgroupnav.php:82
msgid "User groups"
-msgstr ""
+msgstr "Gruppos de usatores"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr ""
+msgstr "Etiquettas recente"
#: lib/publicgroupnav.php:88
msgid "Featured"
-msgstr ""
+msgstr "In evidentia"
#: lib/publicgroupnav.php:92
msgid "Popular"
-msgstr ""
+msgstr "Popular"
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "Repeter iste nota"
+msgstr "Repeter iste nota?"
#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repeter iste nota"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Nulle signule usator definite pro le modo de singule usator."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
-msgstr ""
+msgstr "Cassa de sablo"
#: lib/sandboxform.php:78
msgid "Sandbox this user"
-msgstr ""
+msgstr "Mitter iste usator in le cassa de sablo"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr ""
+msgstr "Cercar in sito"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Parola(s)-clave"
#: lib/searchaction.php:162
msgid "Search help"
-msgstr ""
+msgstr "Adjuta super le recerca"
#: lib/searchgroupnav.php:80
msgid "People"
-msgstr ""
+msgstr "Personas"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr ""
+msgstr "Cercar personas in iste sito"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr ""
+msgstr "Cercar in contento de notas"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "Cercar gruppos in iste sito"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Section sin titulo"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Plus…"
#: lib/silenceform.php:67
msgid "Silence"
-msgstr ""
+msgstr "Silentiar"
#: lib/silenceform.php:78
msgid "Silence this user"
-msgstr ""
+msgstr "Silentiar iste usator"
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr ""
+msgstr "Personas que %s seque"
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr ""
+msgstr "Personas qui seque %s"
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
-
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr ""
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr ""
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Gruppos del quales %s es membro"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Nube de etiquettas de personas como auto-etiquettate"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Nube de etiquetta de personas como etiquettate"
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr ""
+msgstr "Nulle"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr ""
+msgstr "Qui scribe le plus"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Retirar del cassa de sablo"
#: lib/unsandboxform.php:80
msgid "Unsandbox this user"
-msgstr ""
+msgstr "Retirar iste usator del cassa de sablo"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Dissilentiar"
#: lib/unsilenceform.php:78
msgid "Unsilence this user"
-msgstr ""
+msgstr "Non plus silentiar iste usator"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Cancellar subscription a iste usator"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr ""
+msgstr "Cancellar subscription"
#: lib/userprofile.php:116
msgid "Edit Avatar"
-msgstr ""
+msgstr "Modificar avatar"
#: lib/userprofile.php:236
msgid "User actions"
-msgstr ""
+msgstr "Actiones de usator"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
-msgstr ""
+msgstr "Modificar configuration de profilo"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
-msgstr ""
+msgstr "Modificar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Inviar un message directe a iste usator"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
-msgstr ""
+msgstr "Message"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
-msgstr ""
+msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
-msgstr ""
+msgstr "alcun secundas retro"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
-msgstr ""
+msgstr "circa un minuta retro"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
-msgstr ""
+msgstr "circa %d minutas retro"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
-msgstr ""
+msgstr "circa un hora retro"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
-msgstr ""
+msgstr "circa %d horas retro"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
-msgstr ""
+msgstr "circa un die retro"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
-msgstr ""
+msgstr "circa %d dies retro"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
-msgstr ""
+msgstr "circa un mense retro"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
-msgstr ""
+msgstr "circa %d menses retro"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
-msgstr ""
+msgstr "circa un anno retro"
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr ""
+msgstr "%s non es un color valide!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index beef92d12..08e4fec95 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:31+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:05+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -21,6 +21,64 @@ msgstr ""
"= 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && "
"n % 100 != 81 && n % 100 != 91);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Samþykkja"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Stillingar fyrir mynd"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Nýskrá"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Friðhelgi"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "Bjóða"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr ""
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Vista"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Stillingar fyrir mynd"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -36,25 +94,29 @@ msgstr "Ekkert þannig merki."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Enginn svoleiðis notandi."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s og vinirnir, síða %d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -95,7 +157,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -106,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr ""
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Færslur frá %1$s og vinum á %2$s!"
@@ -117,23 +179,23 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -148,7 +210,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Þessi aðferð krefst POST."
@@ -179,8 +241,9 @@ msgstr "Gat ekki vistað persónulega síðu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -301,11 +364,11 @@ msgstr "Gat ekki uppfært notanda."
msgid "Two user ids or screen_names must be supplied."
msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr ""
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr ""
@@ -327,7 +390,8 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
msgid "Not a valid nickname."
msgstr "Ekki tækt stuttnefni."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -339,7 +403,8 @@ msgstr "Heimasíða er ekki gild vefslóð."
msgid "Full name is too long (max 255 chars)."
msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
@@ -375,7 +440,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -419,6 +484,115 @@ msgstr "Hópar %s"
msgid "groups on %s"
msgstr "Hópsaðgerðir"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Ótæk stærð."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Ótækt notendanafn eða lykilorð."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Villa kom upp í stillingu notanda."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Bjóst ekki við innsendingu eyðublaðs."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Aðgangur"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Stuttnefni"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Lykilorð"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Allt"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Þessi aðferð krefst POST eða DELETE."
@@ -450,17 +624,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr "Engin staða með þessu kenni fannst."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Fannst ekki"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -475,7 +649,7 @@ msgstr "Skráarsnið myndar ekki stutt."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Uppáhaldsbabl frá %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
@@ -486,7 +660,7 @@ msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
msgid "%s timeline"
msgstr "Rás %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -502,27 +676,22 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Almenningsrás %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s færslur frá öllum!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Svör við %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Svör við %s"
@@ -532,7 +701,7 @@ msgstr "Svör við %s"
msgid "Notices tagged with %s"
msgstr "Babl merkt með %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -592,8 +761,8 @@ msgstr "Upphafleg mynd"
msgid "Preview"
msgstr "Forsýn"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Eyða"
@@ -605,29 +774,6 @@ msgstr "Hlaða upp"
msgid "Crop"
msgstr "Skera af"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Bjóst ekki við innsendingu eyðublaðs."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -665,8 +811,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Nei"
@@ -675,13 +822,13 @@ msgstr "Nei"
msgid "Do not block this user"
msgstr "Opna á þennan notanda"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Já"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Loka á þennan notanda"
@@ -765,7 +912,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Staðfesta tölvupóstfang"
#: actions/confirmaddress.php:159
@@ -783,10 +931,54 @@ msgstr ""
msgid "Notices"
msgstr "Babl"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Babl hefur enga persónulega síðu"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Það komu upp vandamál varðandi setutókann þinn."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Gat ekki uppfært hóp."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Eyða þessu babli"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -815,7 +1007,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?"
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -953,16 +1145,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Vista"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -975,10 +1157,87 @@ msgstr "Þetta babl er ekki í uppáhaldi!"
msgid "Add to favorites"
msgstr "Bæta við sem uppáhaldsbabli"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Ekkert svoleiðis skjal."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Aðrir valkostir"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Notaðu þetta eyðublað til að breyta hópnum."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Lýsing"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Heimasíða er ekki gild vefslóð."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Gat ekki uppfært hóp."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1007,7 +1266,7 @@ msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
msgid "Could not update group."
msgstr "Gat ekki uppfært hóp."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr ""
@@ -1049,7 +1308,8 @@ msgstr ""
"ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Hætta við"
@@ -1130,7 +1390,7 @@ msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
@@ -1142,7 +1402,7 @@ msgstr "Þetta er nú þegar tölvupóstfangið þitt."
msgid "That email address already belongs to another user."
msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Gat ekki sett inn staðfestingarlykil."
@@ -1204,7 +1464,7 @@ msgstr "Þetta babl er nú þegar í uppáhaldi!"
msgid "Disfavor favorite"
msgstr "Ekki lengur í uppáhaldi"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Vinsælt babl"
@@ -1355,7 +1615,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr ""
@@ -1448,23 +1708,23 @@ 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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Stjórnandi"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Loka"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1638,6 +1898,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Þetta er ekki Jabber-kennið þitt."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Innhólf %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1720,7 +1985,7 @@ msgstr "Persónuleg skilaboð"
msgid "Optionally add a personal message to the invitation."
msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Senda"
@@ -1821,7 +2086,7 @@ msgstr "Rangt notendanafn eða lykilorð."
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
@@ -1830,17 +2095,6 @@ msgstr "Innskráning"
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Stuttnefni"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Lykilorð"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Muna eftir mér"
@@ -1873,21 +2127,21 @@ msgstr ""
"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
"action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
@@ -1896,6 +2150,30 @@ msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
msgid "No current status"
msgstr "Engin núverandi staða"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Gat ekki búið til uppáhald."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nýr hópur"
@@ -2006,6 +2284,51 @@ msgstr "Ãtt við notanda"
msgid "Nudge sent!"
msgstr "Ãtt við notanda!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Aðrir valkostir"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Babl hefur enga persónulega síðu"
@@ -2023,8 +2346,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -2037,7 +2360,8 @@ msgid "Notice Search"
msgstr "Leit í babli"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Aðrar stillingar"
#: actions/othersettings.php:71
@@ -2094,6 +2418,11 @@ msgstr "Ótækt bablinnihald"
msgid "Login token expired."
msgstr "Skrá þig inn á síðuna"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Úthólf %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2165,7 +2494,7 @@ msgstr "Get ekki vistað nýja lykilorðið."
msgid "Password saved."
msgstr "Lykilorð vistað."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2173,141 +2502,158 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Bjóða"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "Endurheimta"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Babl vefsíðunnar"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Mynd"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Stillingar fyrir mynd"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Mynd hefur verið uppfærð."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr ""
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Endurheimta"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Babl"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Endurheimta"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Babl vefsíðunnar"
@@ -2370,7 +2716,7 @@ msgid "Full name"
msgstr "Fullt nafn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimasíða"
@@ -2396,7 +2742,7 @@ msgstr "Lýsing"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Staðsetning"
@@ -2422,7 +2768,7 @@ msgstr ""
"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
"bili"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Tungumál"
@@ -2450,7 +2796,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Tímabelti ekki valið."
@@ -2463,24 +2809,24 @@ msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
msgid "Invalid tag: \"%s\""
msgstr "Ógilt merki: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Gat ekki vistað merki."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Gat ekki vistað persónulega síðu."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Gat ekki vistað merki."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Stillingar vistaðar."
@@ -2502,36 +2848,36 @@ msgstr "Almenningsrás, síða %d"
msgid "Public timeline"
msgstr "Almenningsrás"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr ""
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2540,7 +2886,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2573,7 +2919,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Merkjaský"
@@ -2713,7 +3059,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -2754,7 +3100,7 @@ msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Tölvupóstur"
@@ -2859,7 +3205,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Gerast áskrifandi"
@@ -2904,7 +3250,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
msgid "You already repeated that notice."
msgstr "Þú hefur nú þegar lokað á þennan notanda."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "à sviðsljósinu"
@@ -2919,6 +3265,11 @@ msgstr ""
msgid "Replies to %s"
msgstr "Svör við %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Skilaboð til %1$s á %2$s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2960,6 +3311,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Skilaboð til %1$s á %2$s"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Tölfræði"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2969,6 +3325,125 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð."
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Stillingar fyrir mynd"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Babl hefur enga persónulega síðu"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Stuttnefni"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Uppröðun"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Lýsing"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Tölfræði"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Ertu viss um að þú viljir eyða þessu babli?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Uppáhaldsbabl %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Gat ekki sótt uppáhaldsbabl."
@@ -3018,17 +3493,22 @@ msgstr ""
msgid "%s group"
msgstr "%s hópurinn"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Hópmeðlimir %s, síða %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Hópssíðan"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "Vefslóð"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Athugasemd"
@@ -3074,10 +3554,6 @@ msgstr "(Ekkert)"
msgid "All members"
msgstr "Allir meðlimir"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Tölfræði"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr ""
@@ -3133,6 +3609,11 @@ msgstr "Babl sent inn"
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s og vinirnir, síða %d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3158,25 +3639,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3185,7 +3666,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3193,7 +3674,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Svör við %s"
@@ -3211,206 +3692,148 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Ekki tækt tölvupóstfang"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Babl vefsíðunnar"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Nýtt tölvupóstfang til að senda á %s"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Staðbundin sýn"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "Tungumál (ákjósanlegt)"
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "Vefslóð"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Endurheimta"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Samþykkja"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Friðhelgi"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Bjóða"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr ""
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Stillingar fyrir mynd"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3515,15 +3938,26 @@ msgstr "Enginn lykill sleginn inn"
msgid "You are not subscribed to that profile."
msgstr "Þú ert ekki áskrifandi."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Gat ekki vistað áskrift."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ekki staðbundinn notandi."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Þú ert ekki áskrifandi."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Þú ert nú í áskrift"
@@ -3583,7 +4017,7 @@ msgstr "Þetta er fólkið sem þú hlustar á bablið í."
msgid "These are the people whose notices %s listens to."
msgstr "Þetta er fólkið sem %s hlustar á bablið í."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3593,19 +4027,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber snarskilaboðaþjónusta"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Notendur sjálfmerktir með %s - síða %d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3635,7 +4074,8 @@ msgstr "Merki %s"
msgid "User profile"
msgstr "Persónuleg síða notanda"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Ljósmynd"
@@ -3699,7 +4139,7 @@ msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
msgid "Unsubscribed"
msgstr "Ekki lengur áskrifandi"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3714,91 +4154,71 @@ msgstr "Notandi"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Persónuleg síða"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "Bjóða nýjum notendum að vera með"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Allar áskriftir"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
"(best fyrir ómannlega notendur)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Boðskort hefur verið sent út"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "Boðskort hefur verið sent út"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Heimila áskriftir"
@@ -3814,36 +4234,36 @@ msgstr ""
"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
"áskrifandi að babli, smelltu þá á \"Hætta við\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Samþykkja"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Gerast áskrifandi að þessum notanda"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Hafna"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr ""
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Engin heimildarbeiðni!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Ãskrift heimiluð"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3854,11 +4274,11 @@ msgstr ""
"leiðbeiningar síðunnar um það hvernig á að heimila áskrift. Ãskriftartókinn "
"þinn er;"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Ãskrift hafnað"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3868,37 +4288,37 @@ msgstr ""
"Ãskriftinni hefur verið hafnað en afturkallsveffang var ekki sent. Athugaðu "
"leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Röng gerð myndar fyrir '%s'"
@@ -3917,6 +4337,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Hópmeðlimir %s, síða %d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3943,11 +4368,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Tölfræði"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3979,12 +4399,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Stuttnefni"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Persónulegt"
@@ -3993,10 +4408,6 @@ msgstr "Persónulegt"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Lýsing"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4047,60 +4458,87 @@ msgstr "Gat ekki skeytt skilaboðum inn í."
msgid "Could not update message with new URI."
msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Gat ekki vistað babl. Óþekktur notandi."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
"mínútur."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Notandinn hefur lokað á þig."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ekki í áskrift!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Gat ekki eytt áskrift."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Gat ekki eytt áskrift."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Gat ekki búið til hóp."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Gat ekki skráð hópmeðlimi."
@@ -4141,132 +4579,128 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Ónafngreind síða"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Heim"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Aðgangur"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
"persónulegu síðunni þinni"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Tengjast"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjóða"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Útskráning"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Búa til aðgang"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjálp"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Leita"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Babl vefsíðunnar"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Staðbundin sýn"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Babl síðunnar"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Um"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Spurt og svarað"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Friðhelgi"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Frumþula"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4275,12 +4709,12 @@ msgstr ""
"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er örbloggsþjónusta."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4291,34 +4725,56 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "Allt "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Ãður"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Það komu upp vandamál varðandi setutókann þinn."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4354,11 +4810,105 @@ msgstr "Staðfesting tölvupóstfangs"
msgid "Design configuration"
msgstr "SMS staðfesting"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS staðfesting"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS staðfesting"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS staðfesting"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS staðfesting"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Frumþula"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Fjarlægja"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4379,12 +4929,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Lykilorðabreyting"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Lykilorðabreyting"
@@ -4538,83 +5088,92 @@ msgstr "Vandamál komu upp við að vista babl."
msgid "Specify the name of the user to subscribe to"
msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Enginn svoleiðis notandi."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Nú ert þú áskrifandi að %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Skipun hefur ekki verið fullbúin"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Tilkynningar af."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Get ekki slökkt á tilkynningum."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Tilkynningar á."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Nú ert þú ekki lengur áskrifandi að %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4628,6 +5187,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4655,20 +5215,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Enginn staðfestingarlykill."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -4685,6 +5245,15 @@ msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)"
msgid "Updates by SMS"
msgstr "Færslur sendar með SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Tengjast"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4871,12 +5440,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5081,7 +5650,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "frá"
@@ -5200,59 +5769,55 @@ msgid "Do not share my location"
msgstr "Gat ekki vistað merki."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Nei"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "à sviðsljósinu"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Svara þessu babli"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Babl sent inn"
@@ -5286,12 +5851,7 @@ msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
msgid "Duplicate notice"
msgstr "Eyða babli"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Gat ekki sett inn nýja áskrift."
@@ -5307,19 +5867,19 @@ msgstr "Svör"
msgid "Favorites"
msgstr "Uppáhald"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Innhólf"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Mótteknu skilaboðin þín"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Úthólf"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Skilaboð sem þú hefur sent"
@@ -5400,6 +5960,10 @@ msgstr "Svara þessu babli"
msgid "Repeat this notice"
msgstr "Svara þessu babli"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5471,36 +6035,6 @@ msgstr "Fólk sem eru áskrifendur að %s"
msgid "Groups %s is a member of"
msgstr "Hópar sem %s er meðlimur í"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Notandinn hefur lokað á þig."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Gat ekki farið í áskrift."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ekki í áskrift!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Gat ekki eytt áskrift."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Gat ekki eytt áskrift."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5553,67 +6087,67 @@ msgstr ""
msgid "User actions"
msgstr "Notandaaðgerðir"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr ""
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Senda bein skilaboð til þessa notanda"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Skilaboð"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
@@ -5627,7 +6161,7 @@ msgstr ""
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 81c1d1fe7..7e3d7998a 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,17 +9,71 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:34+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:09+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Accesso"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Impostazioni di accesso al sito"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registrazione"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privato"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Proibire agli utenti anonimi (che non hanno effettuato l'accesso) di vedere "
+"il sito?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Solo invito"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Rende la registrazione solo su invito"
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Chiuso"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Disabilita la creazione di nuovi account"
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salva"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Salva impostazioni di accesso"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +88,29 @@ msgstr "Pagina inesistente."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Utente inesistente."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s e amici, pagina %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -100,7 +158,7 @@ msgstr ""
"qualche cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%3"
"$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -113,8 +171,8 @@ msgstr ""
msgid "You and friends"
msgstr "Tu e i tuoi amici"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Messaggi da %1$s e amici su %2$s!"
@@ -124,23 +182,23 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Metodo delle API non trovato."
@@ -154,7 +212,7 @@ msgstr "Metodo delle API non trovato."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Questo metodo richiede POST."
@@ -185,8 +243,9 @@ msgstr "Impossibile salvare il profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -302,11 +361,11 @@ msgstr "Non puoi non seguirti."
msgid "Two user ids or screen_names must be supplied."
msgstr "Devono essere forniti due ID utente o nominativi."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Impossibile determinare l'utente sorgente."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Impossibile trovare l'utente destinazione."
@@ -330,7 +389,8 @@ msgstr "Soprannome già in uso. Prova con un altro."
msgid "Not a valid nickname."
msgstr "Non è un soprannome valido."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -342,7 +402,8 @@ msgstr "L'indirizzo della pagina web non è valido."
msgid "Full name is too long (max 255 chars)."
msgstr "Nome troppo lungo (max 255 caratteri)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descrizione è troppo lunga (max %d caratteri)."
@@ -378,7 +439,7 @@ msgstr "L'alias non può essere lo stesso del soprannome."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Gruppo non trovato!"
@@ -419,6 +480,116 @@ msgstr "Gruppi di %s"
msgid "groups on %s"
msgstr "Gruppi su %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Nessun parametro oauth_token fornito."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Token non valido."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Nome utente o password non valido."
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Errore nel database nell'eliminare l'applicazione utente OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Il token di richiesta %s è stato autorizzato. Scambiarlo con un token di "
+"accesso."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Il token di richiesta %s è stato rifiutato o revocato."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Invio del modulo inaspettato."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Un'applicazione vorrebbe collegarsi al tuo account"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Consenti o nega l'accesso"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"L'applicazione <strong>%1$s</strong> di <strong>%2$s</strong> vorrebbe poter "
+"<strong>%3$s</strong> ai dati del tuo account %4$s. È consigliato fornire "
+"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Account"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Soprannome"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Password"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Nega"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Consenti"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Consenti o nega l'accesso alle informazioni del tuo account."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Questo metodo richiede POST o DELETE."
@@ -446,19 +617,19 @@ msgstr "Messaggio eliminato."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr "Nessun stato trovato con quel ID."
+msgstr "Nessuno stato trovato con quel ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Troppo lungo. Lunghezza massima %d caratteri."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Non trovato"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -473,7 +644,7 @@ msgstr "Formato non supportato."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Preferiti da %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
@@ -484,7 +655,7 @@ msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
msgid "%s timeline"
msgstr "Attività di %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -500,27 +671,22 @@ msgstr "%1$s / Messaggi che citano %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Attività pubblica di %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Aggiornamenti di %s da tutti!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Ripetuto da %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Ripetuto a %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Ripetizioni di %s"
@@ -530,7 +696,7 @@ msgstr "Ripetizioni di %s"
msgid "Notices tagged with %s"
msgstr "Messaggi etichettati con %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Messaggi etichettati con %1$s su %2$s!"
@@ -591,8 +757,8 @@ msgstr "Originale"
msgid "Preview"
msgstr "Anteprima"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Elimina"
@@ -604,30 +770,6 @@ msgstr "Carica"
msgid "Crop"
msgstr "Ritaglia"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Invio del modulo inaspettato."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Scegli un'area quadrata per la tua immagine personale"
@@ -666,8 +808,9 @@ msgstr ""
"tuoi messaggi, non potrà più abbonarsi e non riceverai notifica delle @-"
"risposte che ti invierà."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
@@ -675,13 +818,13 @@ msgstr "No"
msgid "Do not block this user"
msgstr "Non bloccare questo utente"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Sì"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
@@ -764,7 +907,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Impossibile eliminare l'email di conferma."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Conferma indirizzo"
#: actions/confirmaddress.php:159
@@ -781,10 +924,50 @@ msgstr "Conversazione"
msgid "Notices"
msgstr "Messaggi"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Devi eseguire l'accesso per eliminare un'applicazione."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Applicazione non trovata."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Questa applicazione non è di tua proprietà."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Si è verificato un problema con il tuo token di sessione."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Elimina applicazione"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Vuoi eliminare questa applicazione? Questa azione eliminerà tutti i dati "
+"riguardo all'applicazione dal database, comprese tutte le connessioni utente."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Non eliminare l'applicazione"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Elimina l'applicazione"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -815,7 +998,7 @@ msgstr "Vuoi eliminare questo messaggio?"
msgid "Do not delete this notice"
msgstr "Non eliminare il messaggio"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -947,16 +1130,6 @@ msgstr "Ripristina i valori predefiniti"
msgid "Reset back to default"
msgstr "Reimposta i valori predefiniti"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Salva"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Salva aspetto"
@@ -969,9 +1142,75 @@ msgstr "Questo messaggio non è un preferito!"
msgid "Add to favorites"
msgstr "Aggiungi ai preferiti"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Nessun documento."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Nessun documento \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Modifica applicazione"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Devi eseguire l'accesso per modificare un'applicazione."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Nessuna applicazione."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Usa questo modulo per modificare la tua applicazione."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Il nome è richiesto."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Il nome è troppo lungo (max 255 caratteri)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Nome già in uso. Prova con un altro."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "La descrizione è richiesta."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "L'URL sorgente è troppo lungo."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "L'URL sorgente non è valido."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "L'organizzazione è richiesta."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "L'organizzazione è troppo lunga (max 255 caratteri)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Il sito web dell'organizzazione è richiesto."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Il callback è troppo lungo."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "L'URL di callback non è valido."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Impossibile aggiornare l'applicazione."
#: actions/editgroup.php:56
#, php-format
@@ -1000,7 +1239,7 @@ msgstr "La descrizione è troppo lunga (max %d caratteri)."
msgid "Could not update group."
msgstr "Impossibile aggiornare il gruppo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Impossibile creare gli alias."
@@ -1042,7 +1281,8 @@ msgstr ""
"istruzioni."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Annulla"
@@ -1125,7 +1365,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare quell'indirizzo email"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
@@ -1137,7 +1377,7 @@ msgstr "Quello è già il tuo indirizzo email."
msgid "That email address already belongs to another user."
msgstr "Quell'indirizzo email appartiene già a un altro utente."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Impossibile inserire il codice di conferma."
@@ -1199,7 +1439,7 @@ msgstr "Questo messaggio è già un preferito!"
msgid "Disfavor favorite"
msgstr "Rimuovi preferito"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Messaggi famosi"
@@ -1347,7 +1587,7 @@ msgstr "L'utente è già bloccato dal gruppo."
msgid "User is not a member of group."
msgstr "L'utente non fa parte del gruppo."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Blocca l'utente dal gruppo"
@@ -1445,23 +1685,23 @@ msgstr "Membri del gruppo %1$s, pagina %2$d"
msgid "A list of the users in this group."
msgstr "Un elenco degli utenti in questo gruppo."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Amministra"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blocca"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Rende l'utente amministratore del gruppo"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Rendi amm."
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Rende questo utente un amministratore"
@@ -1642,6 +1882,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Quello non è il tuo ID di Jabber."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Casella posta in arrivo di %s - pagina %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1724,7 +1969,7 @@ msgstr "Messaggio personale"
msgid "Optionally add a personal message to the invitation."
msgstr "Puoi aggiungere un messaggio personale agli inviti."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Invia"
@@ -1824,7 +2069,7 @@ msgstr "Nome utente o password non corretto."
msgid "Error setting user. You are probably not authorized."
msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
@@ -1833,17 +2078,6 @@ msgstr "Accedi"
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Soprannome"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Password"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Ricordami"
@@ -1873,22 +2107,22 @@ msgstr ""
"Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]"
"(%%action.register%%) un nuovo account."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
"Solo gli amministratori possono rendere un altro utente amministratori."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s è già amministratore del gruppo \"%2$s\"."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Impossibile recuperare la membership per %1$s nel gruppo %2$s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
@@ -1897,6 +2131,26 @@ msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
msgid "No current status"
msgstr "Nessun messaggio corrente"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nuova applicazione"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Devi eseguire l'accesso per registrare un'applicazione."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Usa questo modulo per registrare un'applicazione."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "L'URL sorgente è richiesto."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Impossibile creare l'applicazione."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nuovo gruppo"
@@ -1962,7 +2216,7 @@ msgid "Text search"
msgstr "Cerca testo"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
msgstr "Risultati della ricerca per \"%1$s\" su %2$s"
@@ -2009,6 +2263,50 @@ msgstr "Richiamo inviato"
msgid "Nudge sent!"
msgstr "Richiamo inviato!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Devi eseguire l'accesso per poter elencare le tue applicazioni."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Applicazioni OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Applicazioni che hai registrato"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Non hai ancora registrato alcuna applicazione."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Applicazioni collegate"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Hai consentito alle seguenti applicazioni di accedere al tuo account."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Non sei un utente di quella applicazione."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Impossibile revocare l'accesso per l'applicazione: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Non hai autorizzato alcuna applicazione all'uso del tuo account."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Gli sviluppatori possono modificare le impostazioni di registrazione per le "
+"loro applicazioni "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Il messaggio non ha un profilo"
@@ -2026,8 +2324,8 @@ msgstr "tipo di contenuto "
msgid "Only "
msgstr "Solo "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2040,7 +2338,7 @@ msgid "Notice Search"
msgstr "Cerca messaggi"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Altre impostazioni"
#: actions/othersettings.php:71
@@ -2072,30 +2370,30 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
msgstr "Nessun ID utente specificato."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
msgstr "Nessun token di accesso specificato."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
msgstr "Nessun token di accesso richiesto."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
msgstr "Token di accesso specificato non valido."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
msgstr "Token di accesso scaduto."
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Casella posta inviata di %s - pagina %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2168,7 +2466,7 @@ msgstr "Impossibile salvare la nuova password."
msgid "Password saved."
msgstr "Password salvata."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Percorsi"
@@ -2176,132 +2474,148 @@ msgstr "Percorsi"
msgid "Path and server settings for this StatusNet site."
msgstr "Percorso e impostazioni server per questo sito StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Directory del tema non leggibile: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Directory delle immagini degli utenti non scrivibile: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Directory degli sfondi non scrivibile: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Directory delle localizzazioni non leggibile: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Server SSL non valido. La lunghezza massima è di 255 caratteri."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Sito"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Server"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Nome host del server"
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Percorso"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Percorso del sito"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Percorso alle localizzazioni"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Percorso della directory alle localizzazioni"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "URL semplici"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Server del tema"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Percorso del tema"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Directory del tema"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Immagini"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Server dell'immagine"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Percorso dell'immagine"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Directory dell'immagine"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Sfondi"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Server dello sfondo"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Percorso dello sfondo"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Directory dello sfondo"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Mai"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Qualche volta"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Usa SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Quando usare SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "Server SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Server a cui dirigere le richieste SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Salva percorsi"
@@ -2366,7 +2680,7 @@ msgid "Full name"
msgstr "Nome"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina web"
@@ -2389,7 +2703,7 @@ msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Ubicazione"
@@ -2414,7 +2728,7 @@ msgid ""
msgstr ""
"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Lingua"
@@ -2442,7 +2756,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max %d caratteri)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Fuso orario non selezionato"
@@ -2455,23 +2769,23 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
msgid "Invalid tag: \"%s\""
msgstr "Etichetta non valida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Impossibile salvare le preferenze della posizione."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Impossibile salvare il profilo."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Impossibile salvare le etichette."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Impostazioni salvate."
@@ -2493,19 +2807,19 @@ msgstr "Attività pubblica, pagina %d"
msgid "Public timeline"
msgstr "Attività pubblica"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Feed dell'attività pubblica (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Feed dell'attività pubblica (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Feed dell'attività pubblica (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2514,18 +2828,18 @@ msgstr ""
"Questa è l'attività pubblica di %%site.name%%, ma nessuno ha ancora scritto "
"qualche cosa."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Fallo tu!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
"Perché non [crei un account](%%action.register%%) e scrivi qualche cosa!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2538,7 +2852,7 @@ msgstr ""
"net/). [Registrati](%%action.register%%) per condividere messaggi con i tuoi "
"amici, i tuoi familiari e colleghi! ([Maggiori informazioni](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2574,7 +2888,7 @@ msgid ""
"one!"
msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Insieme delle etichette"
@@ -2715,7 +3029,7 @@ msgstr "Codice di invito non valido."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registra"
@@ -2759,7 +3073,7 @@ msgid "Same as password above. Required."
msgstr "Stessa password di sopra; richiesta"
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2866,7 +3180,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abbonati"
@@ -2904,7 +3218,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
msgid "You already repeated that notice."
msgstr "Hai già ripetuto quel messaggio."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Ripetuti"
@@ -2918,6 +3232,11 @@ msgstr "Ripetuti!"
msgid "Replies to %s"
msgstr "Risposte a %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Risposte a %1$s, pagina %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2965,6 +3284,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Risposte a %1$s su %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito."
@@ -2973,6 +3296,121 @@ msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito."
msgid "User is already sandboxed."
msgstr "L'utente è già nella \"sandbox\"."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessioni"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Impostazioni di sessione per questo sito di StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gestione sessioni"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Indica se gestire autonomamente le sessioni"
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Debug delle sessioni"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Abilita il debug per le sessioni"
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Salva impostazioni"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Devi eseguire l'accesso per visualizzare un'applicazione."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Profilo applicazione"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Icona"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nome"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organizzazione"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrizione"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "creata da %1$s - %2$s accessi predefiniti - %3$d utenti"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Azioni applicazione"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Reimposta chiave e segreto"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Informazioni applicazione"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Chiave consumatore"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Segreto consumatore"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL token di richiesta"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL token di accesso"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "URL di autorizzazione"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Nota: sono supportate firme HMAC-SHA1, ma non è supportato il metodo di "
+"firma di testo in chiaro."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Ripristinare la chiave e il segreto?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Messaggi preferiti di %1$s, pagina %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Impossibile recuperare i messaggi preferiti."
@@ -3027,19 +3465,24 @@ msgstr "Questo è un modo per condividere ciò che ti piace."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr "Gruppi di %s"
+msgstr "Gruppo %s"
+
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Gruppi di %1$s, pagina %2$d"
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Profilo del gruppo"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Nota"
@@ -3085,10 +3528,6 @@ msgstr "(nessuno)"
msgid "All members"
msgstr "Tutti i membri"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistiche"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Creato"
@@ -3152,6 +3591,11 @@ msgstr "Messaggio eliminato."
msgid " tagged %s"
msgstr " etichettati con %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, pagina %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3177,12 +3621,12 @@ msgstr "Feed dei messaggi per %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF per %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3190,7 +3634,7 @@ msgstr ""
"Visto niente di interessante? Non hai scritto ancora alcun messaggio, questo "
"potrebbe essere un buon momento per iniziare! :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3199,7 +3643,7 @@ msgstr ""
"Puoi provare a richiamare %1$s o [scrivere qualche cosa che attiri la sua "
"attenzione](%%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3213,7 +3657,7 @@ msgstr ""
"i messaggi di **%s** e di molti altri! ([Maggiori informazioni](%%%%doc.help%"
"%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3224,7 +3668,7 @@ msgstr ""
"it.wikipedia.org/wiki/Microblogging) basato sul software libero [StatusNet]"
"(http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Ripetizione di %s"
@@ -3241,199 +3685,145 @@ msgstr "L'utente è già stato zittito."
msgid "Basic settings for this StatusNet site."
msgstr "Impostazioni di base per questo sito StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Il nome del sito non deve avere lunghezza parti a zero."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Devi avere un'email di contatto valida."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
msgstr "Lingua \"%s\" sconosciuta."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "URL di segnalazione snapshot non valido."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Valore di esecuzione dello snapshot non valido."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "La frequenza degli snapshot deve essere un numero."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Il limite minimo del testo è di 140 caratteri."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "Il limite per i duplicati deve essere di 1 o più secondi."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Generale"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Nome del sito"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Il nome del tuo sito, topo \"Acme Microblog\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Offerto da"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Testo usato per i crediti nel piè di pagina di ogni pagina"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URL per offerto da"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL usato per i crediti nel piè di pagina di ogni pagina"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Indirizzo email di contatto per il sito"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Locale"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Fuso orario predefinito"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Fuso orario predefinito; tipicamente UTC"
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Lingua predefinita"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Server"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Nome host del server"
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "URL semplici"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Accesso"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Privato"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-"Proibire agli utenti anonimi (che non hanno effettuato l'accesso) di vedere "
-"il sito?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Solo invito"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Rende la registrazione solo su invito"
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Chiuso"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Disabilita la creazione di nuovi account"
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Snapshot"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "A caso quando avviene un web hit"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "In un job pianificato"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Snapshot dei dati"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Quando inviare dati statistici a status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frequenza"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Gli snapshot verranno inviati ogni N web hit"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL per la segnalazione"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Gli snapshot verranno inviati a questo URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limiti"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Limiti del testo"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Numero massimo di caratteri per messaggo"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Limite duplicati"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Quanto tempo gli utenti devono attendere (in secondi) prima di inviare "
"nuovamente lo stesso messaggio"
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Salva impostazioni"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "Impostazioni SMS"
@@ -3537,15 +3927,26 @@ msgstr "Nessun codice inserito"
msgid "You are not subscribed to that profile."
msgstr "Non hai una abbonamento a quel profilo."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Impossibile salvare l'abbonamento."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Non un utente locale."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Nessun file."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Non hai una abbonamento a quel profilo."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abbonati"
@@ -3609,7 +4010,7 @@ msgstr "Queste sono le persone che stai seguendo."
msgid "These are the people whose notices %s listens to."
msgstr "Queste sono le persone seguite da %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3624,19 +4025,24 @@ msgstr ""
"[usi Twitter](%%action.twittersettings%%), puoi abbonarti automaticamente "
"alle persone che già seguivi lì."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s non sta seguendo nessuno."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3665,7 +4071,8 @@ msgstr "Etichetta %s"
msgid "User profile"
msgstr "Profilo utente"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Fotografia"
@@ -3726,7 +4133,7 @@ msgstr "Nessun ID di profilo nella richiesta."
msgid "Unsubscribed"
msgstr "Abbonamento annullato"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3743,85 +4150,65 @@ msgstr "Utente"
msgid "User settings for this StatusNet site."
msgstr "Impostazioni utente per questo sito StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite per la biografia non valido. Deve essere numerico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"Testo di benvenuto non valido. La lunghezza massima è di 255 caratteri."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profilo"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Limite biografia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Lunghezza massima in caratteri della biografia"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nuovi utenti"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Messaggio per nuovi utenti"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Abbonamento predefinito"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Abbonare automaticamente i nuovi utenti a questo utente"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Inviti"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Inviti abilitati"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Indica se consentire agli utenti di invitarne di nuovi"
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessioni"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Gestione sessioni"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Indica se gestire autonomamente le sessioni"
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Debug delle sessioni"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Abilita il debug per le sessioni"
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizza abbonamento"
@@ -3835,36 +4222,36 @@ msgstr ""
"Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licenza"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Accetta"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Abbonati a questo utente"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Rifiuta"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Rifiuta questo abbonamento"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Nessuna richiesta di autorizzazione!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Abbonamento autorizzato"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3874,11 +4261,11 @@ msgstr ""
"richiamo. Controlla le istruzioni del sito per i dettagli su come "
"autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Abbonamento rifiutato"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3888,37 +4275,37 @@ msgstr ""
"richiamo. Controlla le istruzioni del sito per i dettagli su come rifiutare "
"completamente l'abbonamento."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "URL \"%s\" dell'ascoltatore non trovato qui."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "L'URL \"%s\" del profilo è per un utente locale."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "L'URL \"%s\" dell'immagine non è valido."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Impossibile leggere l'URL \"%s\" dell'immagine."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Tipo di immagine errata per l'URL \"%s\"."
@@ -3939,6 +4326,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Gustati il tuo hotdog!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Gruppi di %1$s, pagina %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Cerca altri gruppi"
@@ -3967,10 +4359,6 @@ msgstr ""
"Questo sito esegue il software %1$s versione %2$s, Copyright 2008-2010 "
"StatusNet, Inc. e collaboratori."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Collaboratori"
@@ -4012,11 +4400,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugin"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nome"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versione"
@@ -4024,10 +4408,6 @@ msgstr "Versione"
msgid "Author(s)"
msgstr "Autori"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descrizione"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4050,19 +4430,16 @@ msgstr ""
"Un file di questa dimensione supererebbe la tua quota mensile di %d byte."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Profilo del gruppo"
+msgstr "Ingresso nel gruppo non riuscito."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Impossibile aggiornare il gruppo."
+msgstr "Non si fa parte del gruppo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Profilo del gruppo"
+msgstr "Uscita dal gruppo non riuscita."
#: classes/Login_token.php:76
#, php-format
@@ -4081,27 +4458,27 @@ msgstr "Impossibile inserire il messaggio."
msgid "Could not update message with new URI."
msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Errore del DB nell'inserire un hashtag: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problema nel salvare il messaggio. Troppo lungo."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
"qualche minuto."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4109,34 +4486,57 @@ msgstr ""
"Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di "
"nuovo tra qualche minuto."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Errore del DB nell'inserire la risposta: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Problema nel salvare la casella della posta del gruppo."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Non ti è possibile abbonarti."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Hai già l'abbonamento!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "L'utente non ti consente di seguirlo."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Non hai l'abbonamento!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Impossibile eliminare l'auto-abbonamento."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Impossibile eliminare l'abbonamento."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenuti su %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Impossibile creare il gruppo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Impossibile impostare la membership al gruppo."
@@ -4169,7 +4569,7 @@ msgid "Other options"
msgstr "Altre opzioni"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
@@ -4177,128 +4577,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Pagina senza nome"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Home"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Account"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Connetti"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invita"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Esci"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crea un account"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Aiuto"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Cerca"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Messaggio del sito"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Viste locali"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Pagina messaggio"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Informazioni"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Sorgenti"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4307,12 +4703,12 @@ msgstr ""
"**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]"
"(%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** è un servizio di microblog. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4323,33 +4719,58 @@ msgstr ""
"s, disponibile nei termini della licenza [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
+"riservati."
+
+#: lib/action.php:827
msgid "All "
msgstr "Tutti "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licenza."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Precedenti"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Si è verificato un problema con il tuo token di sessione."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4379,10 +4800,101 @@ msgstr "Configurazione di base"
msgid "Design configuration"
msgstr "Configurazione aspetto"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Configurazione utente"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Configurazione di accesso"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Configurazione percorsi"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Configurazione sessioni"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo "
+"accesso in lettura."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"Tentativo di autorizzazione API non riuscito, soprannome = %1$s, proxy = %2"
+"$s, IP = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Modifica applicazione"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Icona per questa applicazione"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Descrivi l'applicazione in %d caratteri"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Descrivi l'applicazione"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL sorgente"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL della pagina web di questa applicazione"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organizzazione responsabile per questa applicazione"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL della pagina web dell'organizzazione"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL verso cui redirigere dopo l'autenticazione"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Browser"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Desktop"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Tipo di applicazione, browser o desktop"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Sola lettura"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Lettura-scrittura"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Revoca"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Allegati"
@@ -4403,11 +4915,11 @@ msgstr "Messaggi in cui appare questo allegato"
msgid "Tags for this attachment"
msgstr "Etichette per questo allegato"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Modifica della password non riuscita"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "La modifica della password non è permessa"
@@ -4558,82 +5070,92 @@ msgstr "Errore nel salvare il messaggio."
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica il nome dell'utente a cui abbonarti."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Utente inesistente."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Abbonati a %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Abbonamento a %s annullato"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comando non ancora implementato."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notifiche disattivate."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Impossibile disattivare le notifiche."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notifiche attivate."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Il comando di accesso è disabilitato"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 "
"minuti: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Abbonamento a %s annullato"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Il tuo abbonamento è stato annullato."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Persona di cui hai già un abbonamento:"
msgstr[1] "Persone di cui hai già un abbonamento:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Nessuno è abbonato ai tuoi messaggi."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Non fai parte di alcun gruppo."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non fai parte di questo gruppo:"
msgstr[1] "Non fai parte di questi gruppi:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4647,6 +5169,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4713,21 +5236,21 @@ msgstr ""
"tracks - non ancora implementato\n"
"tracking - non ancora implementato\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Non è stato trovato alcun file di configurazione. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "I file di configurazione sono stati cercati in questi posti: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
"Potrebbe essere necessario lanciare il programma d'installazione per "
"correggere il problema."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Vai al programma d'installazione."
@@ -4743,6 +5266,14 @@ msgstr "Messaggi via messaggistica istantanea (MI)"
msgid "Updates by SMS"
msgstr "Messaggi via SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Connessioni"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Applicazioni collegate autorizzate"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Errore del database"
@@ -4928,15 +5459,15 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Lingua \"%s\" sconosciuta."
+msgstr "Sorgente casella in arrivo %d sconosciuta."
#: lib/joinform.php:114
msgid "Join"
@@ -5214,7 +5745,7 @@ msgstr ""
"iniziare una conversazione con altri utenti. Altre persone possono mandare "
"messaggi riservati solamente a te."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "via"
@@ -5324,67 +5855,63 @@ msgid "Attach a file"
msgstr "Allega un file"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
msgstr "Condividi la mia posizione"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
msgstr "Non condividere la mia posizione"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Nascondi info"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Il recupero della tua posizione geografica sta impiegando più tempo del "
+"previsto. Riprova più tardi."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "presso"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
-msgstr "nel contesto"
+msgstr "in una discussione"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Ripetuto da"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Rispondi a questo messaggio"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Rispondi"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Messaggio ripetuto"
@@ -5416,11 +5943,7 @@ msgstr "Errore nell'inserire il profilo remoto"
msgid "Duplicate notice"
msgstr "Messaggio duplicato"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Non ti è possibile abbonarti."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Impossibile inserire un nuovo abbonamento."
@@ -5436,19 +5959,19 @@ msgstr "Risposte"
msgid "Favorites"
msgstr "Preferiti"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "In arrivo"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "I tuoi messaggi in arrivo"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Inviati"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "I tuoi messaggi inviati"
@@ -5525,6 +6048,10 @@ msgstr "Ripetere questo messaggio?"
msgid "Repeat this notice"
msgstr "Ripeti questo messaggio"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Nessun utente singolo definito per la modalità single-user."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Sandbox"
@@ -5592,34 +6119,6 @@ msgstr "Persone abbonate a %s"
msgid "Groups %s is a member of"
msgstr "Gruppi di cui %s fa parte"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Hai già l'abbonamento!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "L'utente non ti consente di seguirlo."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Impossibile abbonarsi."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Impossibile abbonare altri a te."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Non hai l'abbonamento!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Impossibile eliminare l'auto-abbonamento."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Impossibile eliminare l'abbonamento."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5670,67 +6169,67 @@ msgstr "Modifica immagine"
msgid "User actions"
msgstr "Azioni utente"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Modifica impostazioni del profilo"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Modifica"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Invia un messaggio diretto a questo utente"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Messaggio"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "circa un anno fa"
@@ -5744,7 +6243,7 @@ msgstr "%s non è un colore valido."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index b3c04d2f4..e05ddbd15 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,17 +11,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:37+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:12+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "アクセス"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "サイトアクセス設定"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "登録"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "プライベート"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "匿åユーザー(ログインã—ã¦ã„ã¾ã›ã‚“)ãŒã‚µã‚¤ãƒˆã‚’見るã®ã‚’ç¦æ­¢ã—ã¾ã™ã‹?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "招待ã®ã¿"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "招待ã®ã¿ç™»éŒ²ã™ã‚‹"
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "é–‰ã˜ã‚‰ã‚ŒãŸ"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "æ–°è¦ç™»éŒ²ã‚’無効。"
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "ä¿å­˜"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "アクセス設定ã®ä¿å­˜"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -36,25 +88,29 @@ msgstr "ãã®ã‚ˆã†ãªãƒšãƒ¼ã‚¸ã¯ã‚りã¾ã›ã‚“。"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
-msgstr "ãã®ã‚ˆã†ãªåˆ©ç”¨è€…ã¯ã„ã¾ã›ã‚“。"
+msgstr "ãã®ã‚ˆã†ãªãƒ¦ãƒ¼ã‚¶ã¯ã„ã¾ã›ã‚“。"
+
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s ã¨å‹äººã€ãƒšãƒ¼ã‚¸ %2$d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -99,7 +155,7 @@ msgstr ""
"プロフィールã‹ã‚‰ [%1$s ã•ã‚“ã«åˆå›³](../%2$s) ã—ãŸã‚Šã€[知らã›ãŸã„ã“ã¨ã«ã¤ã„ã¦æŠ•"
"稿](%%%%action.newnotice%%%%?status_textarea=%3$s) ã—ãŸã‚Šã§ãã¾ã™ã€‚"
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -112,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "ã‚ãªãŸã¨å‹äºº"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚りã¾ã™ï¼"
@@ -123,23 +179,23 @@ msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚りã¾ã™ï¼"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
@@ -153,7 +209,7 @@ msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ãŒå¿…è¦ã§ã™ã€‚"
@@ -167,7 +223,7 @@ msgstr ""
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
-msgstr "利用者を更新ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+msgstr "ユーザを更新ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/apiaccountupdateprofile.php:112
#: actions/apiaccountupdateprofilebackgroundimage.php:194
@@ -176,7 +232,7 @@ msgstr "利用者を更新ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
-msgstr "利用者ã¯ãƒ—ロフィールをもã£ã¦ã„ã¾ã›ã‚“。"
+msgstr "ユーザã¯ãƒ—ロフィールをもã£ã¦ã„ã¾ã›ã‚“。"
#: actions/apiaccountupdateprofile.php:147
msgid "Could not save profile."
@@ -184,8 +240,9 @@ msgstr "プロフィールをä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -216,11 +273,11 @@ msgstr "自分自身をブロックã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼"
#: actions/apiblockcreate.php:126
msgid "Block user failed."
-msgstr "利用者ã®ãƒ–ロックã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+msgstr "ユーザã®ãƒ–ロックã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
-msgstr "利用者ã®ãƒ–ロック解除ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+msgstr "ユーザã®ãƒ–ロック解除ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: actions/apidirectmessage.php:89
#, php-format
@@ -253,11 +310,11 @@ msgstr "é•·ã™ãŽã¾ã™ã€‚ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚"
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
-msgstr "å—ã‘å–り手ã®åˆ©ç”¨è€…ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
+msgstr "å—ã‘å–り手ã®ãƒ¦ãƒ¼ã‚¶ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apidirectmessagenew.php:150
msgid "Can't send direct messages to users who aren't your friend."
-msgstr "å‹äººã§ãªã„利用者ã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
+msgstr "å‹äººã§ãªã„ユーザã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
@@ -282,17 +339,17 @@ msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’å–り消ã™ã“ã¨ãŒã§ãã¾ã›ã‚“。"
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
-msgstr "利用者をフォローã§ãã¾ã›ã‚“ã§ã—ãŸ: 利用者ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
+msgstr "ユーザをフォローã§ãã¾ã›ã‚“ã§ã—ãŸ: ユーザãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
msgstr ""
-"利用者をフォローã§ãã¾ã›ã‚“ã§ã—ãŸ: %s ã¯æ—¢ã«ã‚ãªãŸã®ãƒªã‚¹ãƒˆã«å…¥ã£ã¦ã„ã¾ã™ã€‚"
+"ユーザをフォローã§ãã¾ã›ã‚“ã§ã—ãŸ: %s ã¯æ—¢ã«ã‚ãªãŸã®ãƒªã‚¹ãƒˆã«å…¥ã£ã¦ã„ã¾ã™ã€‚"
#: actions/apifriendshipsdestroy.php:109
msgid "Could not unfollow user: User not found."
-msgstr "利用者ã®ãƒ•ã‚©ãƒ­ãƒ¼ã‚’åœæ­¢ã§ãã¾ã›ã‚“ã§ã—ãŸ: 利用者ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
+msgstr "ユーザã®ãƒ•ã‚©ãƒ­ãƒ¼ã‚’åœæ­¢ã§ãã¾ã›ã‚“ã§ã—ãŸ: ユーザãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself."
@@ -302,11 +359,11 @@ msgstr "è‡ªåˆ†è‡ªèº«ã‚’ãƒ•ã‚©ãƒ­ãƒ¼åœæ­¢ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
msgid "Two user ids or screen_names must be supplied."
msgstr "ãµãŸã¤ã®ï¼©ï¼¤ã‹ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ãƒãƒ¼ãƒ ãŒå¿…è¦ã§ã™ã€‚"
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "ソースユーザーを決定ã§ãã¾ã›ã‚“。"
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "ターゲットユーザーを見ã¤ã‘られã¾ã›ã‚“。"
@@ -330,7 +387,8 @@ msgstr "ãã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¯æ—¢ã«ä½¿ç”¨ã•れã¦ã„ã¾ã™ã€‚ä»–ã®ã‚‚ã®
msgid "Not a valid nickname."
msgstr "有効ãªãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã§ã¯ã‚りã¾ã›ã‚“。"
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -342,7 +400,8 @@ msgstr "ホームページã®URLãŒä¸é©åˆ‡ã§ã™ã€‚"
msgid "Full name is too long (max 255 chars)."
msgstr "フルãƒãƒ¼ãƒ ãŒé•·ã™ãŽã¾ã™ã€‚(255å­—ã¾ã§ï¼‰"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "記述ãŒé•·ã™ãŽã¾ã™ã€‚(最長140字)"
@@ -378,7 +437,7 @@ msgstr "別åã¯ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¨åŒã˜ã§ã¯ã„ã‘ã¾ã›ã‚“。"
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "グループãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!"
@@ -393,7 +452,7 @@ msgstr "管ç†è€…ã«ã‚ˆã£ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•れã¦ã„ã¾
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "利用者 %1$s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %2$s ã«å‚加ã§ãã¾ã›ã‚“。"
+msgstr "ユーザ %1$s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %2$s ã«å‚加ã§ãã¾ã›ã‚“。"
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
@@ -402,7 +461,7 @@ msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "利用者 %1$s をグループ %2$s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。"
+msgstr "ユーザ %1$s をグループ %2$s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。"
#: actions/apigrouplist.php:95
#, php-format
@@ -419,13 +478,119 @@ msgstr "%s グループ"
msgid "groups on %s"
msgstr "%s 上ã®ã‚°ãƒ«ãƒ¼ãƒ—"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "oauth_token ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã¯æä¾›ã•れã¾ã›ã‚“ã§ã—ãŸã€‚"
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "䏿­£ãªãƒˆãƒ¼ã‚¯ãƒ³ã€‚"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«å•題ãŒã‚りã¾ã—ãŸã€‚å†åº¦ãŠè©¦ã—ãã ã•ã„。"
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "䏿­£ãªãƒ¦ãƒ¼ã‚¶åã¾ãŸã¯ãƒ‘スワード。"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "OAuth アプリケーションユーザã®å‰Šé™¤æ™‚DBエラー。"
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "OAuth アプリケーションユーザã®è¿½åŠ æ™‚ï¼¤ï¼¢ã‚¨ãƒ©ãƒ¼ã€‚"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"リクエストトークン %s ã¯æ‰¿èªã•れã¾ã—ãŸã€‚ アクセストークンã¨ãれを交æ›ã—ã¦ãã "
+"ã•ã„。"
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "リクエストトークン%sã¯ã€æ‹’å¦ã•れã¦ã€å–り消ã•れã¾ã—ãŸã€‚"
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "予期ã›ã¬ãƒ•ォームé€ä¿¡ã§ã™ã€‚"
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "アプリケーションã¯ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«æŽ¥ç¶šã—ãŸã„ã§ã™"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "アクセスを許å¯ã¾ãŸã¯æ‹’çµ¶"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "アカウント"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "ニックãƒãƒ¼ãƒ "
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "パスワード"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "æ‹’çµ¶"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "許å¯"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "アカウント情報ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã™ã‚‹ã‹ã€ã¾ãŸã¯æ‹’çµ¶ã—ã¦ãã ã•ã„。"
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ã‹ DELETE ãŒå¿…è¦ã§ã™ã€‚"
#: actions/apistatusesdestroy.php:130
msgid "You may not delete another user's status."
-msgstr "ä»–ã®åˆ©ç”¨è€…ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’消ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
+msgstr "ä»–ã®ãƒ¦ãƒ¼ã‚¶ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’消ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
@@ -448,17 +613,17 @@ msgstr "ステータスを削除ã—ã¾ã—ãŸã€‚"
msgid "No status with that ID found."
msgstr "ãã®ï¼©ï¼¤ã§ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚りã¾ã›ã‚“。"
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "é•·ã™ãŽã¾ã™ã€‚ã¤ã¶ã‚„ãã¯æœ€å¤§ 140 å­—ã¾ã§ã§ã™ã€‚"
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "ã¿ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "ã¤ã¶ã‚„ã㯠URL ã‚’å«ã‚ã¦æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚"
@@ -472,7 +637,7 @@ msgstr "サãƒãƒ¼ãƒˆå¤–ã®å½¢å¼ã§ã™ã€‚"
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / %2$s ã‹ã‚‰ã®ãŠæ°—ã«å…¥ã‚Š"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s 㯠%2$s ã§ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°ã—ã¾ã—㟠/ %2$s。"
@@ -483,7 +648,7 @@ msgstr "%1$s 㯠%2$s ã§ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°ã—ã¾ã—㟠/ %2$s。"
msgid "%s timeline"
msgstr "%s ã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -499,27 +664,22 @@ msgstr "%1$s / %2$s ã«ã¤ã„ã¦æ›´æ–°"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%2$s ã‹ã‚‰ã‚¢ãƒƒãƒ—デートã«ç­”ãˆã‚‹ %1$s アップデート"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s ã®ãƒ‘ブリックタイムライン"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "皆ã‹ã‚‰ã® %s アップデート!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "%s ã«ã‚ˆã‚‹ç¹°ã‚Šè¿”ã—"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "%s ã¸ã®è¿”ä¿¡"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "%s ã®è¿”ä¿¡"
@@ -529,7 +689,7 @@ msgstr "%s ã®è¿”ä¿¡"
msgid "Notices tagged with %s"
msgstr "%s ã¨ã‚¿ã‚°ä»˜ã‘ã•れãŸã¤ã¶ã‚„ã"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s ã« %1$s ã«ã‚ˆã‚‹æ›´æ–°ãŒã‚りã¾ã™ï¼"
@@ -572,7 +732,7 @@ msgstr "自分ã®ã‚¢ãƒã‚¿ãƒ¼ã‚’アップロードã§ãã¾ã™ã€‚最大サイズ
#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
#: actions/userrss.php:103
msgid "User without matching profile"
-msgstr "åˆã£ã¦ã„るプロフィールã®ãªã„利用者"
+msgstr "åˆã£ã¦ã„るプロフィールã®ãªã„ユーザ"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:251
@@ -589,8 +749,8 @@ msgstr "オリジナル"
msgid "Preview"
msgstr "プレビュー"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "削除"
@@ -602,29 +762,6 @@ msgstr "アップロード"
msgid "Crop"
msgstr "切りå–り"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«å•題ãŒã‚りã¾ã—ãŸã€‚å†åº¦ãŠè©¦ã—ãã ã•ã„。"
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "予期ã›ã¬ãƒ•ォームé€ä¿¡ã§ã™ã€‚"
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã¨ãªã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’æ­£æ–¹å½¢ã§æŒ‡å®š"
@@ -647,11 +784,11 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ãŒå‰Šé™¤ã•れã¾ã—ãŸã€‚"
#: actions/block.php:69
msgid "You already blocked that user."
-msgstr "ãã®åˆ©ç”¨è€…ã¯ã™ã§ã«ãƒ–ロック済ã¿ã§ã™ã€‚"
+msgstr "ãã®ãƒ¦ãƒ¼ã‚¶ã¯ã™ã§ã«ãƒ–ロック済ã¿ã§ã™ã€‚"
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
-msgstr "ブロック利用者"
+msgstr "ユーザをブロック"
#: actions/block.php:130
#, fuzzy
@@ -664,8 +801,9 @@ msgstr ""
"ãŸã‹ã‚‰ãƒ•ォローを外ã•れるã§ã—ょã†ã€å°†æ¥ã€ã‚ãªãŸã«ãƒ•ォローã§ããªã„ã§ã€ã‚ãªãŸã¯"
"ã©ã‚“㪠@-返信 ã«ã¤ã„ã¦ã‚‚ãれらã‹ã‚‰é€šçŸ¥ã•れãªã„ã§ã—ょã†ã€‚"
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "No"
@@ -673,13 +811,13 @@ msgstr "No"
msgid "Do not block this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブロックã™ã‚‹"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロックã™ã‚‹"
@@ -709,11 +847,11 @@ msgstr "%1$s ブロックã•れãŸãƒ—ロファイルã€ãƒšãƒ¼ã‚¸ %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
-msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã¸ã®å‚加をブロックã•れãŸåˆ©ç”¨è€…ã®ãƒªã‚¹ãƒˆã€‚"
+msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã¸ã®å‚加をブロックã•れãŸãƒ¦ãƒ¼ã‚¶ã®ãƒªã‚¹ãƒˆã€‚"
#: actions/blockedfromgroup.php:281
msgid "Unblock user from group"
-msgstr "グループã‹ã‚‰ã®ã‚¢ãƒ³ãƒ–ロック利用者"
+msgstr "グループã‹ã‚‰ã®ã‚¢ãƒ³ãƒ–ロックユーザ"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
@@ -762,7 +900,7 @@ msgid "Couldn't delete email confirmation."
msgstr "メール承èªã‚’削除ã§ãã¾ã›ã‚“"
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "アドレスã®ç¢ºèª"
#: actions/confirmaddress.php:159
@@ -779,10 +917,51 @@ msgstr "会話"
msgid "Notices"
msgstr "ã¤ã¶ã‚„ã"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "アプリケーションを削除ã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "アプリケーションãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ã‚ªãƒ¼ãƒŠãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•題ãŒã‚りã¾ã—ãŸã€‚"
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "アプリケーション削除"
+
+#: actions/deleteapplication.php:149
+#, fuzzy
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"ã‚ãªãŸã¯æœ¬å½“ã«ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除ã—ãŸã„ã§ã™ã‹? ã“れã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãªã—ã§ãƒ‡ãƒ¼ã‚¿"
+"ベースã‹ã‚‰ãƒ¦ãƒ¼ã‚¶ã«é–¢ã™ã‚‹ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’クリアã—ã¾ã™ã€‚"
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションを削除ã—ãªã„ã§ãã ã•ã„"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションを削除"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -798,7 +977,7 @@ msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
-"ã‚ãªãŸã¯æ°¸ä¹…ã«ã¤ã¶ã‚„ãを削除ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“れãŒå®Œäº†ã™ã‚‹ã¨ãã‚Œã‚’å…ƒã«æˆ»"
+"ã‚ãªãŸã¯ã¤ã¶ã‚„ãを永久ã«å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“れãŒå®Œäº†ã™ã‚‹ã¨ãã‚Œã‚’å…ƒã«æˆ»"
"ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
#: actions/deletenotice.php:109 actions/deletenotice.php:141
@@ -813,33 +992,33 @@ msgstr "本当ã«ã“ã®ã¤ã¶ã‚„ãを削除ã—ã¾ã™ã‹ï¼Ÿ"
msgid "Do not delete this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãを削除ã§ãã¾ã›ã‚“。"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãを削除"
#: actions/deleteuser.php:67
msgid "You cannot delete users."
-msgstr "利用者を削除ã§ãã¾ã›ã‚“"
+msgstr "ユーザを削除ã§ãã¾ã›ã‚“"
#: actions/deleteuser.php:74
msgid "You can only delete local users."
-msgstr "ローカル利用者ã®ã¿å‰Šé™¤ã§ãã¾ã™ã€‚"
+msgstr "ローカルユーザã®ã¿å‰Šé™¤ã§ãã¾ã™ã€‚"
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
-msgstr "利用者削除"
+msgstr "ユーザ削除"
#: actions/deleteuser.php:135
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
-"ã‚ãªãŸã¯æœ¬å½“ã«ã“ã®åˆ©ç”¨è€…を削除ã—ãŸã„ã§ã™ã‹? ã“れã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãªã—ã§ãƒ‡ãƒ¼ã‚¿"
-"ベースã‹ã‚‰åˆ©ç”¨è€…ã«é–¢ã™ã‚‹ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’クリアã—ã¾ã™ã€‚"
+"ã‚ãªãŸã¯æœ¬å½“ã«ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除ã—ãŸã„ã§ã™ã‹? ã“れã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãªã—ã§ãƒ‡ãƒ¼ã‚¿"
+"ベースã‹ã‚‰ãƒ¦ãƒ¼ã‚¶ã«é–¢ã™ã‚‹ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’クリアã—ã¾ã™ã€‚"
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
msgid "Delete this user"
-msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’削除"
+msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:316 lib/groupnav.php:119
@@ -945,16 +1124,6 @@ msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ‡ã‚¶ã‚¤ãƒ³ã«æˆ»ã™ã€‚"
msgid "Reset back to default"
msgstr "デフォルトã¸ãƒªã‚»ãƒƒãƒˆã™ã‚‹"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "ä¿å­˜"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "デザインã®ä¿å­˜"
@@ -967,9 +1136,75 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãã¯ãŠæ°—ã«å…¥ã‚Šã§ã¯ã‚りã¾ã›ã‚“!"
msgid "Add to favorites"
msgstr "ãŠæ°—ã«å…¥ã‚Šã«åŠ ãˆã‚‹"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "ãã®ã‚ˆã†ãªãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã¯ã‚りã¾ã›ã‚“。"
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "ãã®ã‚ˆã†ãªãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã¯ã‚りã¾ã›ã‚“。\"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "アプリケーション編集"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "アプリケーションを編集ã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "ãã®ã‚ˆã†ãªã‚¢ãƒ—リケーションã¯ã‚りã¾ã›ã‚“。"
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "ã“ã®ãƒ•ォームを使ã£ã¦ã‚¢ãƒ—リケーションを編集ã—ã¾ã™ã€‚"
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "åå‰ã¯å¿…é ˆã§ã™ã€‚"
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "åå‰ãŒé•·ã™ãŽã¾ã™ã€‚(最大255å­—ã¾ã§ï¼‰"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "ãã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¯æ—¢ã«ä½¿ç”¨ã•れã¦ã„ã¾ã™ã€‚ä»–ã®ã‚‚ã®ã‚’試ã—ã¦ã¿ã¦ä¸‹ã•ã„。"
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "概è¦ãŒå¿…è¦ã§ã™ã€‚"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "ソースURLãŒé•·ã™ãŽã¾ã™ã€‚"
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "ソースURLãŒä¸æ­£ã§ã™ã€‚"
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "組織ãŒå¿…è¦ã§ã™ã€‚"
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "組織ãŒé•·ã™ãŽã¾ã™ã€‚(最大255字)"
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "組織ã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ãŒå¿…è¦ã§ã™ã€‚"
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "コールãƒãƒƒã‚¯ãŒé•·ã™ãŽã¾ã™ã€‚"
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "コールãƒãƒƒã‚¯URLãŒä¸æ­£ã§ã™ã€‚"
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "アプリケーションを更新ã§ãã¾ã›ã‚“。"
#: actions/editgroup.php:56
#, php-format
@@ -998,7 +1233,7 @@ msgstr "記述ãŒé•·ã™ãŽã¾ã™ã€‚(最長 %d 字)"
msgid "Could not update group."
msgstr "グループを更新ã§ãã¾ã›ã‚“。"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "別åを作æˆã§ãã¾ã›ã‚“。"
@@ -1035,11 +1270,12 @@ msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç¢ºèªå¾…ã¡ã§ã™ã€‚å—信ボックス(ã¨ã‚¹ãƒ‘ムボックス)ã«è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸"
+"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ‰¿èªå¾…ã¡ã§ã™ã€‚å—信ボックス(ã¨ã‚¹ãƒ‘ムボックス)ã«è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸"
"ã‹ã‚ŒãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦ãã ã•ã„。"
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "中止"
@@ -1084,17 +1320,17 @@ msgstr "ãƒ¡ãƒ¼ãƒ«ã§æ–°è¦ãƒ•ォローã®é€šçŸ¥ã‚’ç§ã«é€ã£ã¦ãã ã•ã„。
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-"ã ã‚Œã‹ãŒãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ç§ã®ã¤ã¶ã‚„ãを加ãˆãŸã‚‰ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„。"
+"ã ã‚Œã‹ãŒãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ç§ã®ã¤ã¶ã‚„ãを加ãˆãŸã‚‰ã€ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„。"
#: actions/emailsettings.php:169
msgid "Send me email when someone sends me a private message."
msgstr ""
-"ã ã‚Œã‹ãŒãƒ—ライベート・メッセージをç§ã«é€ã‚‹ã¨ãã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•"
+"ã ã‚Œã‹ãŒãƒ—ライベート・メッセージをç§ã«é€ã‚‹ã¨ãã«ã¯ã€ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•"
"ã„。"
#: actions/emailsettings.php:174
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "ã ã‚Œã‹ãŒ\"@-返信\"ã‚’ç§ã‚’é€ã‚‹ã¨ãã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„ã€"
+msgstr "ã ã‚Œã‹ãŒ\"@-返信\"ã‚’ç§ã‚’é€ã‚‹ã¨ãã«ã¯ã€ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„ã€"
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1122,7 +1358,7 @@ msgid "Cannot normalize that email address"
msgstr "ãã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æ­£è¦åŒ–ã§ãã¾ã›ã‚“"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "有効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚りã¾ã›ã‚“。"
@@ -1134,24 +1370,24 @@ msgstr "ã“れã¯ã™ã§ã«ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™ã€‚"
msgid "That email address already belongs to another user."
msgstr "ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ—¢ã«ä»–ã®äººãŒä½¿ã£ã¦ã„ã¾ã™ã€‚"
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
-msgstr "確èªã‚³ãƒ¼ãƒ‰ã‚’追加ã§ãã¾ã›ã‚“"
+msgstr "承èªã‚³ãƒ¼ãƒ‰ã‚’追加ã§ãã¾ã›ã‚“"
#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-"確èªç”¨ã‚³ãƒ¼ãƒ‰ã‚’入力ã•れãŸé›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã—ãŸã€‚å—信ボックス(ã¨ã‚¹"
-"パムボックス)ã«ã‚³ãƒ¼ãƒ‰ã¨ãれをã©ã†ä½¿ã†ã®ã‹ã¨ã„ã†æŒ‡ç¤ºãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦"
-"ãã ã•ã„。"
+"承èªã‚³ãƒ¼ãƒ‰ã‚’入力ã•れãŸé›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã—ãŸã€‚å—信ボックス(ã¨ã‚¹ãƒ‘"
+"ムボックス)ã«ã‚³ãƒ¼ãƒ‰ã¨ãれをã©ã†ä½¿ã†ã®ã‹ã¨ã„ã†æŒ‡ç¤ºãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦ã"
+"ã ã•ã„。"
#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
-msgstr "èªè¨¼å¾…ã¡ã®ã‚‚ã®ã¯ã‚りã¾ã›ã‚“。"
+msgstr "承èªå¾…ã¡ã®ã‚‚ã®ã¯ã‚りã¾ã›ã‚“。"
#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
@@ -1160,7 +1396,7 @@ msgstr "ãã® IM アドレスã¯ä¸æ­£ã§ã™ã€‚"
#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
-msgstr "確èªä½œæ¥­ãŒä¸­æ­¢ã•れã¾ã—ãŸã€‚"
+msgstr "承èªä½œæ¥­ãŒä¸­æ­¢ã•れã¾ã—ãŸã€‚"
#: actions/emailsettings.php:413
msgid "That is not your email address."
@@ -1178,7 +1414,7 @@ msgstr "å…¥ã£ã¦ãるメールアドレスã§ã¯ã‚りã¾ã›ã‚“。"
#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
-msgstr "利用者レコードを更新ã§ãã¾ã›ã‚“。"
+msgstr "ユーザレコードを更新ã§ãã¾ã›ã‚“。"
#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
@@ -1196,7 +1432,7 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãã¯ã™ã§ã«ãŠæ°—ã«å…¥ã‚Šã§ã™!"
msgid "Disfavor favorite"
msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’ã‚„ã‚ã‚‹"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "人気ã®ã¤ã¶ã‚„ã"
@@ -1247,17 +1483,17 @@ msgstr "%1$s ã«ã‚ˆã‚‹ %2$s 上ã®ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°!"
#: 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 "フィーãƒãƒ£ãƒ¼ã•れãŸåˆ©ç”¨è€…ã€ãƒšãƒ¼ã‚¸ %d"
+msgstr "フィーãƒãƒ£ãƒ¼ã•れãŸãƒ¦ãƒ¼ã‚¶ã€ãƒšãƒ¼ã‚¸ %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some great users on %s"
-msgstr "%s 上ã®å„ªã‚ŒãŸåˆ©ç”¨è€…ã®é›†ã¾ã‚Š"
+msgstr "%s 上ã®å„ªã‚ŒãŸãƒ¦ãƒ¼ã‚¶ã®é›†ã¾ã‚Š"
#: actions/file.php:34
msgid "No notice ID."
@@ -1289,7 +1525,7 @@ msgstr "ローカルサブスクリプションを使用å¯èƒ½ã§ã™ï¼"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
-msgstr "ã“ã®åˆ©ç”¨è€…ã¯ãƒ•ォローをブロックã•れã¦ã„ã¾ã™ã€‚"
+msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã¯ãƒ•ォローをブロックã•れã¦ã„ã¾ã™ã€‚"
#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
@@ -1339,15 +1575,15 @@ msgstr "管ç†è€…ã ã‘ãŒã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã‚’ブロックã§ãã¾ã™ã€‚
#: actions/groupblock.php:95
msgid "User is already blocked from group."
-msgstr "利用者ã¯ã™ã§ã«ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•れã¦ã„ã¾ã™ã€‚"
+msgstr "ユーザã¯ã™ã§ã«ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•れã¦ã„ã¾ã™ã€‚"
#: actions/groupblock.php:100
msgid "User is not a member of group."
-msgstr "利用者ã¯ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
+msgstr "ユーザã¯ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
-msgstr "グループã‹ã‚‰ãƒ–ロックã•れãŸåˆ©ç”¨è€…"
+msgstr "グループã‹ã‚‰ãƒ¦ãƒ¼ã‚¶ã‚’ブロック"
#: actions/groupblock.php:162
#, php-format
@@ -1356,12 +1592,12 @@ msgid ""
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
-"本当ã«åˆ©ç”¨è€… %1$s をグループ %2$s ã‹ã‚‰ãƒ–ロックã—ã¾ã™ã‹? 彼らã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰å‰Š"
+"本当ã«ãƒ¦ãƒ¼ã‚¶ %1$s をグループ %2$s ã‹ã‚‰ãƒ–ロックã—ã¾ã™ã‹? 彼らã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰å‰Š"
"除ã•ã‚Œã‚‹ã€æŠ•ç¨¿ã§ããªã„ã€ã‚°ãƒ«ãƒ¼ãƒ—をフォローã§ããªããªã‚Šã¾ã™ã€‚"
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
-msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã“ã®åˆ©ç”¨è€…をブロックã—ãªã„"
+msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロックã—ãªã„"
#: actions/groupblock.php:179
msgid "Block this user from this group"
@@ -1369,7 +1605,7 @@ msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロック"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
-msgstr "グループã‹ã‚‰åˆ©ç”¨è€…ブロックã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼"
+msgstr "グループã‹ã‚‰ã®ãƒ–ロックユーザã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼"
#: actions/groupbyid.php:74 actions/userbyid.php:70
msgid "No ID."
@@ -1414,7 +1650,7 @@ msgstr ""
#: actions/grouplogo.php:178
msgid "User without matching profile."
-msgstr "åˆã£ã¦ã„るプロフィールã®ãªã„利用者"
+msgstr "åˆã£ã¦ã„るプロフィールã®ãªã„ユーザ"
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1440,27 +1676,27 @@ msgstr "%1$s グループメンãƒãƒ¼ã€ãƒšãƒ¼ã‚¸ %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
-msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®åˆ©ç”¨è€…ã®ãƒªã‚¹ãƒˆã€‚"
+msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¦ãƒ¼ã‚¶ã®ãƒªã‚¹ãƒˆã€‚"
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "管ç†è€…"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "ブロック"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
-msgstr "利用者をグループã®ç®¡ç†è€…ã«ã™ã‚‹"
+msgstr "ユーザをグループã®ç®¡ç†è€…ã«ã™ã‚‹"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "管ç†è€…ã«ã™ã‚‹"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
-msgstr "ã“ã®åˆ©ç”¨è€…を管ç†è€…ã«ã™ã‚‹"
+msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’管ç†è€…ã«ã™ã‚‹"
#: actions/grouprss.php:133
#, php-format
@@ -1538,7 +1774,7 @@ msgstr "管ç†è€…ã ã‘ãŒã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã‚’アンブロックã§ãã¾
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
-msgstr "利用者ã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•れã¦ã„ã¾ã›ã‚“。"
+msgstr "ユーザã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•れã¦ã„ã¾ã›ã‚“。"
#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
@@ -1571,7 +1807,7 @@ msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç¢ºèªå¾…ã¡ã§ã™ã€‚Jabber ã‹ Gtalk ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸ã‹ã‚Œ"
+"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ‰¿èªå¾…ã¡ã§ã™ã€‚Jabber ã‹ Gtalk ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸ã‹ã‚Œ"
"ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’確èªã—ã¦ãã ã•ã„。(%s ã‚’å‹äººãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã—ãŸã‹ï¼Ÿ)"
#: actions/imsettings.php:124
@@ -1631,13 +1867,18 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"確èªç”¨ã‚³ãƒ¼ãƒ‰ã‚’入力ã•れ㟠IM アドレスã«é€ä¿¡ã—ã¾ã—ãŸã€‚ã‚ãªãŸã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚Œ"
-"るよã†ã«ã™ã‚‹ã«ã¯%sを承èªã—ã¦ãã ã•ã„。"
+"承èªã‚³ãƒ¼ãƒ‰ã‚’入力ã•れ㟠IM アドレスã«é€ä¿¡ã—ã¾ã—ãŸã€‚ã‚ãªãŸã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚Œã‚‹"
+"よã†ã«ã™ã‚‹ã«ã¯%sを承èªã—ã¦ãã ã•ã„。"
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
msgstr "ãã® Jabber ID ã¯ã‚ãªãŸã®ã‚‚ã®ã§ã¯ã‚りã¾ã›ã‚“。"
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%1$s ã®å—ä¿¡ç®± - ページ %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1668,11 +1909,11 @@ msgstr "招待をé€ã‚Šã¾ã—ãŸã€‚"
#: actions/invite.php:112
msgid "Invite new users"
-msgstr "æ–°ã—ã„利用者を招待"
+msgstr "æ–°ã—ã„ユーザを招待"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr "ã™ã§ã«ã“れらã®åˆ©ç”¨è€…をフォローã—ã¦ã„ã¾ã™:"
+msgstr "ã™ã§ã«ã“れらã®ãƒ¦ãƒ¼ã‚¶ã‚’フォローã—ã¦ã„ã¾ã™:"
#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
#, php-format
@@ -1720,9 +1961,9 @@ msgstr "パーソナルメッセージ"
msgid "Optionally add a personal message to the invitation."
msgstr "ä»»æ„ã«æ‹›å¾…ã«ãƒ‘ーソナルメッセージを加ãˆã¦ãã ã•ã„。"
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
-msgstr "é€ã‚‹"
+msgstr "投稿"
#: actions/invite.php:226
#, php-format
@@ -1820,7 +2061,7 @@ msgstr "ユーザåã¾ãŸã¯ãƒ‘スワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚"
msgid "Error setting user. You are probably not authorized."
msgstr "ユーザ設定エラー。 ã‚ãªãŸã¯ãŸã¶ã‚“承èªã•れã¦ã„ã¾ã›ã‚“。"
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
@@ -1829,17 +2070,6 @@ msgstr "ログイン"
msgid "Login to site"
msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "ニックãƒãƒ¼ãƒ "
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "パスワード"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "ãƒ­ã‚°ã‚¤ãƒ³çŠ¶æ…‹ã‚’ä¿æŒ"
@@ -1869,21 +2099,21 @@ msgstr ""
"ユーザåã¨ãƒ‘スワードã§ã€ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。 ã¾ã ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã›ã‚“"
"ã‹? æ–°ã—ã„アカウントを [登録](%%action.register%%)。"
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "管ç†è€…ã ã‘ãŒåˆ¥ã®ãƒ¦ãƒ¼ã‚¶ã‚’管ç†è€…ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s ã¯ã™ã§ã«ã‚°ãƒ«ãƒ¼ãƒ— \"%2$s\" ã®ç®¡ç†è€…ã§ã™ã€‚"
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "%1$s ã®ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’グループ %2$s 中ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“。"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "%1$s をグループ %2$s ã®ç®¡ç†è€…ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
@@ -1892,6 +2122,26 @@ msgstr "%1$s をグループ %2$s ã®ç®¡ç†è€…ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
msgid "No current status"
msgstr "ç¾åœ¨ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚りã¾ã›ã‚“"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "æ–°ã—ã„アプリケーション"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "アプリケーションを登録ã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "ã“ã®ãƒ•ォームを使ã£ã¦æ–°ã—ã„アプリケーションを登録ã—ã¾ã™ã€‚"
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "ソースURLãŒå¿…è¦ã§ã™ã€‚"
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "アプリケーションを作æˆã§ãã¾ã›ã‚“。"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "æ–°ã—ã„グループ"
@@ -1906,7 +2156,7 @@ msgstr "æ–°ã—ã„メッセージ"
#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
msgid "You can't send a message to this user."
-msgstr "ã“ã®åˆ©ç”¨è€…ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
+msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
#: lib/command.php:475
@@ -1993,7 +2243,7 @@ msgstr "\"%2$s\" ä¸Šã®æ¤œç´¢èªž \"$1$s\" ã«ä¸€è‡´ã™ã‚‹ã™ã¹ã¦ã®æ›´æ–°"
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
-"ã“ã®åˆ©ç”¨è€…ã¯ã€åˆå›³ã‚’許å¯ã—ã¦ã„ãªã„ã‹ã€ç¢ºèªã•れã¦ã„ãŸçŠ¶æ…‹ã§ãªã„ã‹ã€ãƒ¡ãƒ¼ãƒ«è¨­å®š"
+"ã“ã®ãƒ¦ãƒ¼ã‚¶ã¯ã€åˆå›³ã‚’許å¯ã—ã¦ã„ãªã„ã‹ã€ç¢ºèªã•れã¦ã„ãŸçŠ¶æ…‹ã§ãªã„ã‹ã€ãƒ¡ãƒ¼ãƒ«è¨­å®š"
"ã‚’ã—ã¦ã„ã¾ã›ã‚“。"
#: actions/nudge.php:94
@@ -2004,6 +2254,50 @@ msgstr "åˆå›³ã‚’é€ã£ãŸ"
msgid "Nudge sent!"
msgstr "åˆå›³ã‚’é€ã£ãŸ!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "アプリケーションをリストã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth アプリケーション"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "ã‚ãªãŸãŒç™»éŒ²ã—ãŸã‚¢ãƒ—リケーション"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "ã‚ãªãŸã¯ã¾ã ãªã‚“ã®ã‚¢ãƒ—リケーションも登録ã—ã¦ã„ã¾ã›ã‚“。"
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "接続ã•れãŸã‚¢ãƒ—リケーション"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ä»¥ä¸‹ã®ã‚¢ãƒ—リケーションを許å¯ã—ã¾ã—ãŸã€‚"
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "ã‚ãªãŸã¯ãã®ã‚¢ãƒ—リケーションã®ãƒ¦ãƒ¼ã‚¶ã§ã¯ã‚りã¾ã›ã‚“。"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "アプリケーションã®ãŸã‚ã®å–消ã—アクセスãŒã§ãã¾ã›ã‚“: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+"ã‚ãªãŸã¯ã€ã©ã‚“ãªã‚¢ãƒ—リケーションもã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’使用ã™ã‚‹ã®ã‚’èªå¯ã—ã¦ã„"
+"ã¾ã›ã‚“。"
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr "開発者ã¯å½¼ã‚‰ã®ã‚¢ãƒ—リケーションã®ãŸã‚ã«ç™»éŒ²è¨­å®šã‚’編集ã§ãã¾ã™ "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "ã¤ã¶ã‚„ãã«ã¯ãƒ—ロファイルã¯ã‚りã¾ã›ã‚“。"
@@ -2021,8 +2315,8 @@ msgstr "内容種別 "
msgid "Only "
msgstr "ã ã‘ "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "サãƒãƒ¼ãƒˆã•れã¦ã„ãªã„データ形å¼ã€‚"
@@ -2035,7 +2329,7 @@ msgid "Notice Search"
msgstr "ã¤ã¶ã‚„ãæ¤œç´¢"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "ãã®ä»–ã®è¨­å®š"
#: actions/othersettings.php:71
@@ -2068,7 +2362,7 @@ msgstr "URL 短縮サービスãŒé•·ã™ãŽã¾ã™ã€‚(最大50字)"
#: actions/otp.php:69
msgid "No user ID specified."
-msgstr "利用者IDã®è¨˜è¿°ãŒã‚りã¾ã›ã‚“。"
+msgstr "ユーザIDã®è¨˜è¿°ãŒã‚りã¾ã›ã‚“。"
#: actions/otp.php:83
msgid "No login token specified."
@@ -2086,6 +2380,11 @@ msgstr "䏿­£ãªãƒ­ã‚°ã‚¤ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ãŒæŒ‡å®šã•れã¦ã„ã¾ã™ã€‚"
msgid "Login token expired."
msgstr "ãƒ­ã‚°ã‚¤ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ãŒæœŸé™åˆ‡ã‚Œã§ã™ãƒ»"
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "%1$s ã®é€ä¿¡ç®± - ページ %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2158,7 +2457,7 @@ msgstr "æ–°ã—ã„パスワードをä¿å­˜ã§ãã¾ã›ã‚“。"
msgid "Password saved."
msgstr "パスワードãŒä¿å­˜ã•れã¾ã—ãŸã€‚"
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "パス"
@@ -2166,132 +2465,148 @@ msgstr "パス"
msgid "Path and server settings for this StatusNet site."
msgstr "パス㨠StatusNet サイトã®ã‚µãƒ¼ãƒãƒ¼è¨­å®š"
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "テーマディレクトリãŒèª­ã¿è¾¼ã‚ã¾ã›ã‚“: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“ : %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "場所ディレクトリãŒèª­ã¿è¾¼ã‚ã¾ã›ã‚“: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "䏿­£ãª SSL サーãƒãƒ¼ã€‚最大 255 文字ã¾ã§ã€‚"
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "サイト"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "サーãƒãƒ¼"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "サイトã®ã‚µãƒ¼ãƒãƒ¼ãƒ›ã‚¹ãƒˆå"
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "パス"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "サイトパス"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "ロケールã®ãƒ‘ス"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "ロケールã¸ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ‘ス"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Fancy URL (読ã¿ã‚„ã™ã忘れã«ãã„) を使用ã—ã¾ã™ã‹?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "テーマ"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "テーマサーãƒãƒ¼"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "テーマパス"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "テーマディレクトリ"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "ã‚¢ãƒã‚¿ãƒ¼"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ã‚µãƒ¼ãƒãƒ¼"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ãƒ‘ス"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã‚µãƒ¼ãƒãƒ¼"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ãƒ‘ス"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr ""
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "ã¨ãã©ã"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "ã„ã¤ã‚‚"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "SSL 使用"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "SSL 使用時"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSLサーãƒ"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "ダイレクト SSL リクエストをå‘ã‘るサーãƒ"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "ä¿å­˜ãƒ‘ス"
@@ -2354,7 +2669,7 @@ msgid "Full name"
msgstr "フルãƒãƒ¼ãƒ "
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ホームページ"
@@ -2377,7 +2692,7 @@ msgstr "自己紹介"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "場所"
@@ -2403,7 +2718,7 @@ msgstr ""
"自分自身ã«ã¤ã„ã¦ã®ã‚¿ã‚° (ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã€æ•°å­—ã€-ã€.ã€_)ã€ã‚«ãƒ³ãƒžã¾ãŸã¯ç©ºç™½åŒºåˆ‡"
"りã§"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "言語"
@@ -2429,7 +2744,7 @@ msgstr "自分をフォローã—ã¦ã„る者を自動的ã«ãƒ•ォローã™ã‚‹ (B
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介ãŒé•·ã™ãŽã¾ã™ (最長140文字)。"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "タイムゾーンãŒé¸ã°ã‚Œã¦ã„ã¾ã›ã‚“。"
@@ -2442,23 +2757,23 @@ msgstr "言語ãŒé•·ã™ãŽã¾ã™ã€‚(最大50å­—)"
msgid "Invalid tag: \"%s\""
msgstr "䏿­£ãªã‚¿ã‚°: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
-msgstr "自動フォローã®ãŸã‚ã®åˆ©ç”¨è€…ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+msgstr "自動フォローã®ãŸã‚ã®ãƒ¦ãƒ¼ã‚¶ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "場所情報をä¿å­˜ã§ãã¾ã›ã‚“。"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "プロファイルをä¿å­˜ã§ãã¾ã›ã‚“"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "ã‚¿ã‚°ã‚’ä¿å­˜ã§ãã¾ã›ã‚“。"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "設定ãŒä¿å­˜ã•れã¾ã—ãŸã€‚"
@@ -2480,19 +2795,19 @@ msgstr "パブリックタイムラインã€ãƒšãƒ¼ã‚¸ %d"
msgid "Public timeline"
msgstr "パブリックタイムライン"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "パブリックストリームフィード (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "パブリックストリームフィード (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "パブリックストリームフィード (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2501,11 +2816,11 @@ msgstr ""
"ã“れ㯠%%site.name%% ã®ãƒ‘ブリックタイムラインã§ã™ã€ã—ã‹ã—ã¾ã èª°ã‚‚投稿ã—ã¦ã„ã¾"
"ã›ã‚“。"
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "投稿ã™ã‚‹1番目ã«ãªã£ã¦ãã ã•ã„!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2513,7 +2828,7 @@ msgstr ""
"ãªãœ [アカウント登録](%%action.register%%) ã—ãªã„ã®ã§ã™ã‹ã€ãã—ã¦æœ€åˆã®æŠ•稿を"
"ã—ã¦ãã ã•ã„!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2527,7 +2842,7 @@ msgstr ""
"æ—ãã—ã¦åŒåƒšãªã©ã«ã¤ã„ã¦ã®ã¤ã¶ã‚„ãを共有ã—ã¾ã—ょã†! ([ã‚‚ã£ã¨èª­ã‚€](%%doc.help%"
"%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2566,7 +2881,7 @@ msgstr ""
"ãªãœ [アカウント登録](%%action.register%%) ã—ãªã„ã®ã§ã™ã‹ã€‚ãã—ã¦æœ€åˆã®æŠ•稿を"
"ã—ã¦ãã ã•ã„!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "タグクラウド"
@@ -2596,7 +2911,7 @@ msgstr "確èªã‚³ãƒ¼ãƒ‰ãŒå¤ã™ãŽã¾ã™ã€‚ã‚‚ã†ä¸€åº¦ã‚„り直ã—ã¦ãã ã•
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr "確èªã•れãŸãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§åˆ©ç”¨è€…ã‚’æ›´æ–°ã§ãã¾ã›ã‚“。"
+msgstr "確èªã•れãŸãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ãƒ¦ãƒ¼ã‚¶ã‚’æ›´æ–°ã§ãã¾ã›ã‚“。"
#: actions/recoverpassword.php:152
msgid ""
@@ -2656,11 +2971,11 @@ msgstr "ニックãƒãƒ¼ãƒ ã‹ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’入力ã—ã¦ãã ã•ã„。
#: actions/recoverpassword.php:272
msgid "No user with that email address or username."
-msgstr "ãã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹ãƒ¦ãƒ¼ã‚¶åã‚’ã‚‚ã£ã¦ã„る利用者ãŒã‚りã¾ã›ã‚“。"
+msgstr "ãã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹ãƒ¦ãƒ¼ã‚¶åã‚’ã‚‚ã£ã¦ã„るユーザãŒã‚りã¾ã›ã‚“。"
#: actions/recoverpassword.php:287
msgid "No registered email address for that user."
-msgstr "ãã®åˆ©ç”¨è€…ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç™»éŒ²ãŒã‚りã¾ã›ã‚“。"
+msgstr "ãã®ãƒ¦ãƒ¼ã‚¶ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç™»éŒ²ãŒã‚りã¾ã›ã‚“。"
#: actions/recoverpassword.php:301
msgid "Error saving address confirmation."
@@ -2704,7 +3019,7 @@ msgstr "ã™ã¿ã¾ã›ã‚“ã€ä¸æ­£ãªæ‹›å¾…コード。"
msgid "Registration successful"
msgstr "登録æˆåŠŸ"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
@@ -2747,7 +3062,7 @@ msgid "Same as password above. Required."
msgstr "上ã®ãƒ‘スワードã¨åŒã˜ã§ã™ã€‚ 必須。"
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "メール"
@@ -2774,7 +3089,7 @@ msgid ""
msgstr "個人情報を除ã: パスワードã€ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã€IMアドレスã€é›»è©±ç•ªå·"
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2791,15 +3106,15 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"%1$s ã•ã‚“ã€ãŠã‚ã§ã¨ã†ã”ã–ã„ã¾ã™ï¼%%%%site.name%%%% ã¸ã‚ˆã†ã“ã。以下ã®ã‚ˆã†ã«ã—"
-"ã¦å§‹ã‚ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
+"%1$s ã•ã‚“ã€ãŠã‚ã§ã¨ã†ã”ã–ã„ã¾ã™ï¼%%%%site.name%%%% ã¸ã‚ˆã†ã“ã。次ã®ã‚ˆã†ã«ã—ã¦"
+"å§‹ã‚ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
"\n"
"* [ã‚ãªãŸã®ãƒ—ロファイル](%2$s) ã‚’å‚ç…§ã—ã¦æœ€åˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’投稿ã™ã‚‹\n"
"* [Jabber ã‚„ GTalk ã®ã‚¢ãƒ‰ãƒ¬ã‚¹](%%%%action.imsettings%%%%) を追加ã—ã¦ã€ã‚¤ãƒ³ã‚¹"
"タントメッセージを通ã—ã¦ã¤ã¶ã‚„ãã‚’é€ã‚Œã‚‹ã‚ˆã†ã«ã™ã‚‹\n"
"* ã‚ãªãŸãŒçŸ¥ã£ã¦ã„る人やã‚ãªãŸã¨åŒã˜èˆˆå‘³ã‚’ã‚‚ã£ã¦ã„る人を[検索](%%%%action."
"peoplesearch%%%%) ã™ã‚‹\n"
-"* [プロファイル設定](%%%%action.profilesettings%%%%) ã‚’æ›´æ–°ã—ã¦ä»–ã®åˆ©ç”¨è€…ã«ã‚"
+"* [プロファイル設定](%%%%action.profilesettings%%%%) ã‚’æ›´æ–°ã—ã¦ä»–ã®ãƒ¦ãƒ¼ã‚¶ã«ã‚"
"ãªãŸã®ã“ã¨ã‚’より詳ã—ã知らã›ã‚‹\n"
"* 探ã—ã¦ã„る機能ã«ã¤ã„ã¦[オンライン文書](%%%%doc.help%%%%) を読む\n"
"\n"
@@ -2811,7 +3126,7 @@ msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
-"(メールアドレスを確èªã™ã‚‹æ–¹æ³•を読んã§ã€ã™ãã«ãƒ¡ãƒ¼ãƒ«ã«ã‚ˆã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ã‘å–ã‚‹"
+"(メールアドレスを承èªã™ã‚‹æ–¹æ³•を読んã§ã€ã™ãã«ãƒ¡ãƒ¼ãƒ«ã«ã‚ˆã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ã‘å–ã‚‹"
"よã†ã«ã—ã¦ãã ã•ã„)"
#: actions/remotesubscribe.php:98
@@ -2836,7 +3151,7 @@ msgstr "リモートユーザーをフォロー"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr "利用者ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ "
+msgstr "ユーザã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ "
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
@@ -2851,7 +3166,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "プロファイルサービスã¾ãŸã¯ãƒžã‚¤ã‚¯ãƒ­ãƒ–ロギングサービスã®URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "フォロー"
@@ -2890,7 +3205,7 @@ msgstr "自分ã®ã¤ã¶ã‚„ãã¯ç¹°ã‚Šè¿”ã›ã¾ã›ã‚“。"
msgid "You already repeated that notice."
msgstr "ã™ã§ã«ãã®ã¤ã¶ã‚„ãを繰り返ã—ã¦ã„ã¾ã™ã€‚"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "繰り返ã•れãŸ"
@@ -2904,6 +3219,11 @@ msgstr "繰り返ã•れã¾ã—ãŸ!"
msgid "Replies to %s"
msgstr "%s ã¸ã®è¿”ä¿¡"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%1$s ã¸ã®è¿”ä¿¡ã€ãƒšãƒ¼ã‚¸ %2$s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2935,7 +3255,7 @@ msgid ""
"[join groups](%%action.groups%%)."
msgstr ""
"ã‚ãªãŸã¯ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶ã‚’会話をã™ã‚‹ã‹ã€å¤šãã®äººã€…をフォローã™ã‚‹ã‹ã€ã¾ãŸã¯ [ã‚°"
-"ループã«åŠ ã‚ã‚‹] (%%action.groups%%)ã“ã¨ãŒã§ãã¾ã™ã€‚"
+"ループã«åŠ ã‚ã‚‹](%%action.groups%%)ã“ã¨ãŒã§ãã¾ã™ã€‚"
#: actions/replies.php:205
#, php-format
@@ -2951,13 +3271,133 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%2$s 上㮠%1$s ã¸ã®è¿”ä¿¡!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã®ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ãƒ¦ãƒ¼ã‚¶ãŒã§ãã¾ã›ã‚“。"
#: actions/sandbox.php:72
msgid "User is already sandboxed."
-msgstr "利用者ã¯ã™ã§ã«ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã™ã€‚"
+msgstr "ユーザã¯ã™ã§ã«ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã™ã€‚"
+
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "セッション"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "ã“ã® StatusNet サイトã®ã‚»ãƒƒã‚·ãƒ§ãƒ³è¨­å®šã€‚"
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "ã‚»ãƒƒã‚·ãƒ§ãƒ³ã®æ‰±ã„"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "自分é”ã§ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’扱ã†ã®ã§ã‚ã‚‹ã‹ã©ã†ã‹ã€‚"
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "セッションデãƒãƒƒã‚°"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "セッションã®ãŸã‚ã®ãƒ‡ãƒãƒƒã‚°å‡ºåŠ›ã‚’ã‚ªãƒ³ã€‚"
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "サイト設定ã®ä¿å­˜"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "!!アプリケーションを見るãŸã‚ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "アプリケーションプロファイル"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "アイコン"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "åå‰"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "組織"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "概è¦"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "統計データ"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "アプリケーションアクション"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "key 㨠secret ã®ãƒªã‚»ãƒƒãƒˆ"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "アプリケーション情報"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "リクエストトークンURL"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "アクセストークンURL"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "承èªURL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"注æ„: ç§ãŸã¡ã¯HMAC-SHA1ç½²åをサãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ ç§ãŸã¡ã¯å¹³æ–‡ç½²åメソッドをサ"
+"ãƒãƒ¼ãƒˆã—ã¾ã›ã‚“。"
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "本当ã«ã“ã®ã¤ã¶ã‚„ãを削除ã—ã¾ã™ã‹ï¼Ÿ"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%1$s ã®ãŠæ°—ã«å…¥ã‚Šã®ã¤ã¶ã‚„ãã€ãƒšãƒ¼ã‚¸ %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3016,17 +3456,22 @@ msgstr "ã“れã¯ã€ã‚ãªãŸãŒå¥½ããªã“ã¨ã‚’共有ã™ã‚‹æ–¹æ³•ã§ã™ã€‚"
msgid "%s group"
msgstr "%s グループ"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s グループã€ãƒšãƒ¼ã‚¸ %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "グループプロファイル"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "ノート"
@@ -3072,13 +3517,9 @@ msgstr "(ãªã—)"
msgid "All members"
msgstr "å…¨ã¦ã®ãƒ¡ãƒ³ãƒãƒ¼"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "統計データ"
-
#: actions/showgroup.php:432
msgid "Created"
-msgstr "作æˆã•れã¾ã—ãŸ"
+msgstr "ä½œæˆæ—¥"
#: actions/showgroup.php:448
#, php-format
@@ -3090,7 +3531,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
"**%s** 㯠%%site.name%% 上ã®ãƒ¦ãƒ¼ã‚¶ã‚°ãƒ«ãƒ¼ãƒ—ã§ã™ã€‚フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクロブロギング] (http://en."
+"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクロブロギング](http://en."
"wikipedia.org/wiki/Micro-blogging) サービス。メンãƒãƒ¼ã¯å½¼ã‚‰ã®æš®ã‚‰ã—ã¨èˆˆå‘³ã«é–¢"
"ã™ã‚‹çŸ­ã„メッセージを共有ã—ã¾ã™ã€‚[今ã™ãå‚加](%%%%action.register%%%%) ã—ã¦ã“"
"ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸€å“¡ã«ãªã‚Šã¾ã—ょã†! ([ã‚‚ã£ã¨èª­ã‚€](%%%%doc.help%%%%))"
@@ -3139,6 +3580,11 @@ msgstr "ã¤ã¶ã‚„ãを削除ã—ã¾ã—ãŸã€‚"
msgid " tagged %s"
msgstr "タグ付ã‘ã•れ㟠%s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$sã€ãƒšãƒ¼ã‚¸ %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3164,12 +3610,12 @@ msgstr "%sã®ã¤ã¶ã‚„ãフィード (Atom)"
msgid "FOAF for %s"
msgstr "%s ã® FOAF"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "ã“れ㯠%1$s ã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã™ãŒã€%2$s ã¯ã¾ã ãªã«ã‚‚投稿ã—ã¦ã„ã¾ã›ã‚“。"
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3177,7 +3623,7 @@ msgstr ""
"最近ãŠã‚‚ã—ã‚ã„ã‚‚ã®ã¯ä½•ã§ã—ょã†? ã‚ãªãŸã¯å°‘ã—ã®ã¤ã¶ã‚„ãも投稿ã—ã¦ã„ã¾ã›ã‚“ãŒã€"
"ã„ã¾ã¯å§‹ã‚ã‚‹è‰¯ã„æ™‚ã§ã—ょã†:)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3186,7 +3632,7 @@ msgstr ""
"ã‚ãªãŸã¯ã€%1$s ã«åˆå›³ã™ã‚‹ã‹ã€[ã¾ãŸã¯ãã®äººå®›ã«ä½•ã‹ã‚’投稿](%%%%action."
"newnotice%%%%?status_textarea=%2$s) ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3194,13 +3640,13 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** 㯠%%site.name%% 上ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã™ã€‚フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクロブロギング] (http://en."
+"**%s** 㯠%%%%site.name%%%% 上ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã™ã€‚フリーソフトウェアツール"
+"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクロブロギング](http://en."
"wikipedia.org/wiki/Micro-blogging) サービス。[今ã™ãå‚加](%%%%action.register"
"%%%%)ã—ã¦ã€**%s** ã®ã¤ã¶ã‚„ããªã©ã‚’フォローã—ã¾ã—ょã†! ([ã‚‚ã£ã¨èª­ã‚€](%%%%doc."
"help%%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3208,10 +3654,10 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** 㯠%%site.name%% 上ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã™ã€‚フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクロブロギング] (http://en."
+"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクロブロギング](http://en."
"wikipedia.org/wiki/Micro-blogging) サービス。"
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "%s ã®ç¹°ã‚Šè¿”ã—"
@@ -3222,206 +3668,154 @@ msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ãƒ¦ãƒ¼ã‚¶ã‚’黙らã›ã‚‹ã“ã¨ãŒã§ãã¾
#: actions/silence.php:72
msgid "User is already silenced."
-msgstr "åˆ©ç”¨è€…ã¯æ—¢ã«é»™ã£ã¦ã„ã¾ã™ã€‚"
+msgstr "ãƒ¦ãƒ¼ã‚¶ã¯æ—¢ã«é»™ã£ã¦ã„ã¾ã™ã€‚"
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr "ã“ã® StatusNet サイトã®åŸºæœ¬è¨­å®šã€‚"
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "サイトåã¯é•·ã•0ã§ã¯ã„ã‘ã¾ã›ã‚“。"
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "有効ãªé€£çµ¡ç”¨ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "䏿˜Žãªè¨€èªž \"%s\""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "䏿­£ãªã‚¹ãƒŠãƒƒãƒ—ショットレãƒãƒ¼ãƒˆURL。"
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "䏿­£ãªã‚¹ãƒŠãƒƒãƒ—ショットランãƒãƒªãƒ¥ãƒ¼"
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "ã‚¹ãƒŠãƒƒãƒ—ã‚·ãƒ§ãƒƒãƒˆé »åº¦ã¯æ•°ã§ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "最å°ã®ãƒ†ã‚­ã‚¹ãƒˆåˆ¶é™ã¯140å­—ã§ã™ã€‚"
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "デュープ制é™ã¯1秒以上ã§ãªã‘れã°ãªã‚Šã¾ã›ã‚“。"
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "一般"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "サイトå"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "ã‚ãªãŸã®ã‚µã‚¤ãƒˆã®åå‰ã€\"Yourcompany Microblog\"ã®ã‚ˆã†ãªã€‚"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "æŒã£ã¦æ¥ã‚‰ã‚Œã¾ã™"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
"クレジットã«ä½¿ç”¨ã•れるテキストã¯ã€ãれãžã‚Œã®ãƒšãƒ¼ã‚¸ã®ãƒ•ッターã§ãƒªãƒ³ã‚¯ã•れã¾"
"ã™ã€‚"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URLã§ã€æŒã£ã¦æ¥ã‚‰ã‚Œã¾ã™"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
"クレジットã«ä½¿ç”¨ã•れるURLã¯ã€ãれãžã‚Œã®ãƒšãƒ¼ã‚¸ã®ãƒ•ッターã§ãƒªãƒ³ã‚¯ã•れã¾ã™ã€‚"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "ã‚ãªãŸã®ã‚µã‚¤ãƒˆã«ã‚³ãƒ³ã‚¿ã‚¯ãƒˆã™ã‚‹ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "ローカル"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "デフォルトタイムゾーン"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "サイトã®ãƒ‡ãƒ•ォルトタイムゾーン; 通常UTC。"
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "デフォルトサイト言語"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "サーãƒãƒ¼"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "サイトã®ã‚µãƒ¼ãƒãƒ¼ãƒ›ã‚¹ãƒˆå"
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Fancy URL (読ã¿ã‚„ã™ã忘れã«ãã„) を使用ã—ã¾ã™ã‹?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "アクセス"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "プライベート"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "匿åユーザー(ログインã—ã¦ã„ã¾ã›ã‚“)ãŒã‚µã‚¤ãƒˆã‚’見るã®ã‚’ç¦æ­¢ã—ã¾ã™ã‹?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "招待ã®ã¿"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "招待ã®ã¿ç™»éŒ²ã™ã‚‹"
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "é–‰ã˜ã‚‰ã‚ŒãŸ"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "æ–°è¦ç™»éŒ²ã‚’無効。"
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "スナップショット"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "予定ã•れã¦ã„るジョブã§"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "データスナップショット"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "ã„㤠status.net サーãƒã«çµ±è¨ˆãƒ‡ãƒ¼ã‚¿ã‚’é€ã‚Šã¾ã™ã‹"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "頻度"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "レãƒãƒ¼ãƒˆ URL"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "レãƒãƒ¼ãƒˆ URL"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "ã“ã®URLã«ã‚¹ãƒŠãƒƒãƒ—ショットをé€ã‚‹ã§ã—ょã†"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "制é™"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "テキスト制é™"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "ã¤ã¶ã‚„ãã®æ–‡å­—ã®æœ€å¤§æ•°"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "デュープ制é™"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"ã©ã‚Œãらã„é•·ã„é–“(ç§’)ã€ãƒ¦ãƒ¼ã‚¶ã¯ã€å†ã³åŒã˜ã‚‚ã®ã‚’投稿ã™ã‚‹ã®ã‚’å¾…ãŸãªã‘れã°ãªã‚‰ãª"
"ã„ã‹ã€‚"
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "サイト設定ã®ä¿å­˜"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "SMS 設定"
@@ -3482,7 +3876,7 @@ msgstr "ã“れã¯ã™ã§ã«ã‚ãªãŸã®é›»è©±ç•ªå·ã§ã™ã€‚"
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
-msgstr "ã“ã®é›»è©±ç•ªå·ã¯ã™ã§ã«ä»–ã®åˆ©ç”¨è€…ã«ä½¿ã‚れã¦ã„ã¾ã™ã€‚"
+msgstr "ã“ã®é›»è©±ç•ªå·ã¯ã™ã§ã«ä»–ã®ãƒ¦ãƒ¼ã‚¶ã«ä½¿ã‚れã¦ã„ã¾ã™ã€‚"
#: actions/smssettings.php:347
msgid ""
@@ -3526,15 +3920,26 @@ msgstr "コードãŒå…¥åŠ›ã•れã¦ã„ã¾ã›ã‚“"
msgid "You are not subscribed to that profile."
msgstr "ã‚ãªãŸã¯ãã®ãƒ—ロファイルã«ãƒ•ォローã•れã¦ã„ã¾ã›ã‚“。"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "フォローをä¿å­˜ã§ãã¾ã›ã‚“。"
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ローカルユーザã§ã¯ã‚りã¾ã›ã‚“。"
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "ãã®ã‚ˆã†ãªãƒ•ァイルã¯ã‚りã¾ã›ã‚“。"
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "ã‚ãªãŸã¯ãã®ãƒ—ロファイルã«ãƒ•ォローã•れã¦ã„ã¾ã›ã‚“。"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "フォローã—ã¦ã„ã‚‹"
@@ -3598,7 +4003,7 @@ msgstr "ã‚ãªãŸãŒã¤ã¶ã‚„ãã‚’èžã„ã¦ã„る人"
msgid "These are the people whose notices %s listens to."
msgstr "%s ãŒã¤ã¶ã‚„ãã‚’èžã„ã¦ã„る人"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3609,24 +4014,29 @@ msgid ""
msgstr ""
"今ã€ã ã‚Œã®ã¤ã¶ã‚„ãã‚‚èžã„ã¦ã„ãªã„ãªã‚‰ã€ã‚ãªãŸãŒçŸ¥ã£ã¦ã„る人々をフォローã—ã¦ã¿"
"ã¦ãã ã•ã„。[ピープル検索](%%action.peoplesearch%%)を試ã—ã¦ãã ã•ã„。ãã—ã¦ã€"
-"ã‚ãªãŸãŒèˆˆå‘³ã‚’æŒã£ã¦ã„るグループã¨ç§ãŸã¡ã®[フィーãƒãƒ£ãƒ¼ã•れãŸåˆ©ç”¨è€…](%%"
+"ã‚ãªãŸãŒèˆˆå‘³ã‚’æŒã£ã¦ã„るグループã¨ç§ãŸã¡ã®[フィーãƒãƒ£ãƒ¼ã•れãŸãƒ¦ãƒ¼ã‚¶](%%"
"action.featured%%)ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’探ã—ã¦ãã ã•ã„。もã—[Twitterユーザ](%%action."
"twittersettings%%)ã§ã‚れã°ã€ã‚ãªãŸã¯è‡ªå‹•çš„ã«æ—¢ã«ãƒ•ォローã—ã¦ã„る人々をフォ"
"ローã§ãã¾ã™ã€‚"
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s ã¯ã ã‚Œã‚‚言ã†ã“ã¨ã‚’èžã„ã¦ã„ã¾ã›ã‚“。"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "%1$s ã¨ã‚¿ã‚°ä»˜ã‘ã•れãŸã¤ã¶ã‚„ãã€ãƒšãƒ¼ã‚¸ %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3653,22 +4063,23 @@ msgstr "ã‚¿ã‚° %s"
#: actions/tagother.php:77 lib/userprofile.php:75
msgid "User profile"
-msgstr "利用者プロファイル"
+msgstr "ユーザプロファイル"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "写真"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr "タグ利用者"
+msgstr "タグユーザ"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
-"ã“ã®åˆ©ç”¨è€…ã®ã‚¿ã‚° (ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã€æ•°å­—ã€-ã€.ã€_)ã€ã‚«ãƒ³ãƒžã‹ã‚¹ãƒšãƒ¼ã‚¹åŒºåˆ‡ã‚Š"
+"ã“ã®ãƒ¦ãƒ¼ã‚¶ã®ã‚¿ã‚° (ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã€æ•°å­—ã€-ã€.ã€_)ã€ã‚«ãƒ³ãƒžã‹ã‚¹ãƒšãƒ¼ã‚¹åŒºåˆ‡ã‚Š"
#: actions/tagother.php:193
msgid ""
@@ -3699,11 +4110,11 @@ msgstr "ã‚ãªãŸã¯ãã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロックã—ã¦ã„ã¾ã›ã‚“。"
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
-msgstr "利用者ã¯ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã¯ã‚りã¾ã›ã‚“。"
+msgstr "ユーザã¯ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã¯ã‚りã¾ã›ã‚“。"
#: actions/unsilence.php:72
msgid "User is not silenced."
-msgstr "利用者ã¯ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã§ã¯ã‚りã¾ã›ã‚“。"
+msgstr "ユーザã¯ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã§ã¯ã‚りã¾ã›ã‚“。"
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3713,7 +4124,7 @@ msgstr "リクエスト内ã«ãƒ—ロファイルIDãŒã‚りã¾ã›ã‚“。"
msgid "Unsubscribed"
msgstr "フォロー解除済ã¿"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3724,89 +4135,69 @@ msgstr ""
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
msgid "User"
-msgstr "利用者"
+msgstr "ユーザ"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr "ã“ã® StatusNet サイトã®åˆ©ç”¨è€…設定。"
+msgstr "ã“ã® StatusNet サイトã®ãƒ¦ãƒ¼ã‚¶è¨­å®šã€‚"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "䏿­£ãªè‡ªå·±ç´¹ä»‹åˆ¶é™ã€‚æ•°å­—ã§ã‚ã‚‹å¿…è¦ãŒã‚りã¾ã™ã€‚"
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "䏿­£ãªã‚¦ã‚§ãƒ«ã‚«ãƒ ãƒ†ã‚­ã‚¹ãƒˆã€‚最大長ã¯255å­—ã§ã™ã€‚"
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr "䏿­£ãªãƒ‡ãƒ•ォルトフォローã§ã™: '%1$s' ã¯åˆ©ç”¨è€…ã§ã¯ã‚りã¾ã›ã‚“。"
+msgstr "䏿­£ãªãƒ‡ãƒ•ォルトフォローã§ã™: '%1$s' ã¯ãƒ¦ãƒ¼ã‚¶ã§ã¯ã‚りã¾ã›ã‚“。"
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "プロファイル"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "自己紹介制é™"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "ãƒ—ãƒ­ãƒ•ã‚¡ã‚¤ãƒ«è‡ªå·±ç´¹ä»‹ã®æœ€å¤§æ–‡å­—長。"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
-msgstr "æ–°ã—ã„利用者"
+msgstr "æ–°ã—ã„ユーザ"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
-msgstr "æ–°ã—ã„利用者を歓迎"
+msgstr "æ–°ã—ã„ユーザを歓迎"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
-msgstr "æ–°ã—ã„利用者ã¸ã®ã‚¦ã‚§ãƒ«ã‚«ãƒ ãƒ†ã‚­ã‚¹ãƒˆ (最大255å­—)。"
+msgstr "æ–°ã—ã„ユーザã¸ã®ã‚¦ã‚§ãƒ«ã‚«ãƒ ãƒ†ã‚­ã‚¹ãƒˆ (最大255å­—)。"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "デフォルトフォロー"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
-msgstr "自動的ã«ã“ã®åˆ©ç”¨è€…ã«æ–°ã—ã„利用者をフォローã—ã¦ãã ã•ã„。"
+msgstr "自動的ã«ã“ã®ãƒ¦ãƒ¼ã‚¶ã«æ–°ã—ã„ユーザをフォローã—ã¦ãã ã•ã„。"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "招待"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "招待ãŒå¯èƒ½"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
-msgstr "åˆ©ç”¨è€…ãŒæ–°ã—ã„利用者を招待ã™ã‚‹ã®ã‚’許容ã™ã‚‹ã‹ã©ã†ã‹ã€‚"
-
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "セッション"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "ã‚»ãƒƒã‚·ãƒ§ãƒ³ã®æ‰±ã„"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "自分é”ã§ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’扱ã†ã®ã§ã‚ã‚‹ã‹ã©ã†ã‹ã€‚"
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "セッションデãƒãƒƒã‚°"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "セッションã®ãŸã‚ã®ãƒ‡ãƒãƒƒã‚°å‡ºåŠ›ã‚’ã‚ªãƒ³ã€‚"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãŒæ–°ã—ã„ユーザを招待ã™ã‚‹ã®ã‚’許容ã™ã‚‹ã‹ã©ã†ã‹ã€‚"
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3821,36 +4212,36 @@ msgstr ""
"ユーザã®ã¤ã¶ã‚„ãをフォローã™ã‚‹ã«ã¯è©³ç´°ã‚’確èªã—ã¦ä¸‹ã•ã„。ã ã‚Œã‹ã®ã¤ã¶ã‚„ãã‚’"
"フォローã™ã‚‹ãŸã‚ã«å°‹ã­ãªã„å ´åˆã¯ã€\"Reject\" をクリックã—ã¦ä¸‹ã•ã„。"
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "ライセンス"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "承èª"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’フォロー"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "æ‹’å¦"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "ã“ã®ãƒ•ォローを拒å¦"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "èªè¨¼ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆãŒã‚りã¾ã›ã‚“。"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "ãƒ•ã‚©ãƒ­ãƒ¼ãŒæ‰¿èªã•れã¾ã—ãŸ"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3860,11 +4251,11 @@ msgstr ""
"フォローを承èªã™ã‚‹ã‹ã«é–¢ã™ã‚‹è©³ç´°ã®ãŸã‚ã®ã‚µã‚¤ãƒˆã®æŒ‡ç¤ºã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。"
"ã‚ãªãŸã®ãƒ•ォロートークンã¯:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "ãƒ•ã‚©ãƒ­ãƒ¼ãŒæ‹’å¦"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3874,37 +4265,37 @@ msgstr ""
"ãƒ•ã‚©ãƒ­ãƒ¼ã‚’å®Œå…¨ã«æ‹’çµ¶ã™ã‚‹ã‹ã«é–¢ã™ã‚‹è©³ç´°ã®ãŸã‚ã®ã‚µã‚¤ãƒˆã®æŒ‡ç¤ºã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã "
"ã•ã„。"
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "リスナー URI ‘%s’ ã¯ã“ã“ã§ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "リスニー URI ‘%s’ ãŒé•·ã™ãŽã¾ã™ã€‚"
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "リスニー URI ‘%s’ ã¯ãƒ­ãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "プロファイル URL ‘%s’ ã¯ãƒ­ãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã¯ã‚りã¾ã›ã‚“。"
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "ã‚¢ãƒã‚¿ãƒ¼ URL ‘%s’ ãŒæ­£ã—ãã‚りã¾ã›ã‚“。"
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "ã‚¢ãƒã‚¿ãƒ¼URL を読ã¿å–れã¾ã›ã‚“ '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "ã‚¢ãƒã‚¿ãƒ¼ URL '%s' ã¯ä¸æ­£ãªç”»åƒå½¢å¼ã€‚"
@@ -3926,6 +4317,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "ã‚ãªãŸã®hotdogを楽ã—ã‚“ã§ãã ã•ã„!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s グループã€ãƒšãƒ¼ã‚¸ %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "ã‚‚ã£ã¨ã‚°ãƒ«ãƒ¼ãƒ—を検索"
@@ -3954,10 +4350,6 @@ msgstr ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "コントリビュータ"
@@ -3989,11 +4381,7 @@ msgstr ""
msgid "Plugins"
msgstr "プラグイン"
-#: actions/version.php:195
-msgid "Name"
-msgstr "åå‰"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
@@ -4001,10 +4389,6 @@ msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
msgid "Author(s)"
msgstr "作者"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "概è¦"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4028,19 +4412,16 @@ msgstr ""
"ã“れã»ã©å¤§ãã„ファイルã¯ã‚ãªãŸã®%dãƒã‚¤ãƒˆã®æ¯Žæœˆã®å‰²å½“ã¦ã‚’è¶…ãˆã¦ã„ã‚‹ã§ã—ょã†ã€‚"
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "グループプロファイル"
+msgstr "グループå‚加ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "グループを更新ã§ãã¾ã›ã‚“。"
+msgstr "グループã®ä¸€éƒ¨ã§ã¯ã‚りã¾ã›ã‚“。"
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "グループプロファイル"
+msgstr "グループ脱退ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: classes/Login_token.php:76
#, php-format
@@ -4059,26 +4440,26 @@ msgstr "メッセージを追加ã§ãã¾ã›ã‚“。"
msgid "Could not update message with new URI."
msgstr "æ–°ã—ã„URIã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’アップデートã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°è¿½åŠ  DB エラー: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•題ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚é•·ã™ãŽã§ã™ã€‚"
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
-msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•題ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚䏿˜Žãªåˆ©ç”¨è€…ã§ã™ã€‚"
+msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•題ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚䏿˜Žãªãƒ¦ãƒ¼ã‚¶ã§ã™ã€‚"
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"多ã™ãŽã‚‹ã¤ã¶ã‚„ããŒé€Ÿã™ãŽã¾ã™; 数分間ã®ä¼‘ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†æŠ•稿ã—ã¦ãã ã•ã„。"
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4086,34 +4467,57 @@ msgstr ""
"多ã™ãŽã‚‹é‡è¤‡ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒé€Ÿã™ãŽã¾ã™; 数分間休ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†åº¦æŠ•稿ã—ã¦ãã ã•"
"ã„。"
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ã¤ã¶ã‚„ãを投稿ã™ã‚‹ã®ãŒç¦æ­¢ã•れã¦ã„ã¾ã™ã€‚"
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•題ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "返信を追加ã™ã‚‹éš›ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼ : %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "グループå—信箱をä¿å­˜ã™ã‚‹éš›ã«å•題ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "ã‚ãªãŸã¯ãƒ•ォローãŒç¦æ­¢ã•れã¾ã—ãŸã€‚"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "ã™ã§ã«ãƒ•ォローã—ã¦ã„ã¾ã™!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "ユーザã¯ã‚ãªãŸã‚’ブロックã—ã¾ã—ãŸã€‚"
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "フォローã—ã¦ã„ã¾ã›ã‚“ï¼"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "自己フォローを削除ã§ãã¾ã›ã‚“。"
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "フォローを削除ã§ãã¾ã›ã‚“"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "よã†ã“ã %1$sã€@%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "グループを作æˆã§ãã¾ã›ã‚“。"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "グループメンãƒãƒ¼ã‚·ãƒƒãƒ—をセットã§ãã¾ã›ã‚“。"
@@ -4154,128 +4558,124 @@ msgstr ""
msgid "Untitled page"
msgstr "å称未設定ページ"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "プライマリサイトナビゲーション"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "ホーム"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "パーソナルプロファイルã¨å‹äººã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³"
-#: lib/action.php:435
-msgid "Account"
-msgstr "アカウント"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "メールアドレスã€ã‚¢ãƒã‚¿ãƒ¼ã€ãƒ‘スワードã€ãƒ—ロパティã®å¤‰æ›´"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "接続"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "ã‚µãƒ¼ãƒ“ã‚¹ã¸æŽ¥ç¶š"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "サイト設定ã®å¤‰æ›´"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "招待"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "å‹äººã‚„åŒåƒšãŒ %s ã§åŠ ã‚るよã†èª˜ã£ã¦ãã ã•ã„。"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "ログアウト"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "サイトã‹ã‚‰ãƒ­ã‚°ã‚¢ã‚¦ãƒˆ"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "アカウントを作æˆ"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "ヘルプ"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "助ã‘ã¦ï¼"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "検索"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "人々ã‹ãƒ†ã‚­ã‚¹ãƒˆã‚’検索"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "サイトã¤ã¶ã‚„ã"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "ローカルビュー"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "ページã¤ã¶ã‚„ã"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "セカンダリサイトナビゲーション"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "About"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "よãã‚る質å•"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "プライãƒã‚·ãƒ¼"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "ソース"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "ãƒãƒƒã‚¸"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet ソフトウェアライセンス"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4284,12 +4684,12 @@ msgstr ""
"**%%site.name%%** 㯠[%%site.broughtby%%](%%site.broughtbyurl%%) ãŒæä¾›ã™ã‚‹ãƒž"
"イクロブログサービスã§ã™ã€‚ "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ã¯ãƒžã‚¤ã‚¯ãƒ­ãƒ–ログサービスã§ã™ã€‚ "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4300,33 +4700,55 @@ msgstr ""
"ã„ã¦ã„ã¾ã™ã€‚ ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "サイト内容ライセンス"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "全㦠"
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "ページ化"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "<<後"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "å‰>>"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•題ãŒã‚りã¾ã—ãŸã€‚"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4356,10 +4778,100 @@ msgstr "基本サイト設定"
msgid "Design configuration"
msgstr "デザイン設定"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "ユーザ設定"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "アクセス設定"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "パス設定"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "セッション設定"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"APIリソースã¯èª­ã¿æ›¸ãアクセスãŒå¿…è¦ã§ã™ã€ã—ã‹ã—ã‚ãªãŸã¯èª­ã¿ã‚¢ã‚¯ã‚»ã‚¹ã—ã‹æŒã£ã¦"
+"ã„ã¾ã›ã‚“。"
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "アプリケーション編集"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ã‚¢ã‚¤ã‚³ãƒ³"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "ã‚ãªãŸã®ã‚¢ãƒ—リケーションを %d 字以内記述"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "ã‚ãªãŸã®ã‚¢ãƒ—リケーションを記述"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "ソース URL"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ã® URL"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "ã“ã®ã‚¢ãƒ—リケーションã«è²¬ä»»ãŒã‚る組織"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "組織ã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ã®URL"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "èªè¨¼ã®å¾Œã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã™ã‚‹URL"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "ブラウザ"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "デスクトップ"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "アプリケーションã€ãƒ–ラウザã€ã¾ãŸã¯ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã®ã‚¿ã‚¤ãƒ—"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "リードオンリー"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "リードライト"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"ã“ã®ã‚¢ãƒ—リケーションã®ãŸã‚ã®ãƒ‡ãƒ•ォルトアクセス: リードオンリーã€ã¾ãŸã¯ãƒªãƒ¼ãƒ‰"
+"ライト"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "å–æ¶ˆã—"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "添付"
@@ -4380,11 +4892,11 @@ msgstr "ã“ã®æ·»ä»˜ãŒç¾ã‚Œã‚‹ã¤ã¶ã‚„ã"
msgid "Tags for this attachment"
msgstr "ã“ã®æ·»ä»˜ã®ã‚¿ã‚°"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "パスワード変更ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "パスワード変更ã¯è¨±å¯ã•れã¦ã„ã¾ã›ã‚“"
@@ -4436,7 +4948,7 @@ msgstr "ãã® ID ã«ã‚ˆã‚‹ã¤ã¶ã‚„ãã¯å­˜åœ¨ã—ã¦ã„ã¾ã›ã‚“"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
msgid "User has no last notice"
-msgstr "利用者ã¯ã¾ã ã¤ã¶ã‚„ã„ã¦ã„ã¾ã›ã‚“"
+msgstr "ユーザã¯ã¾ã ã¤ã¶ã‚„ã„ã¦ã„ã¾ã›ã‚“"
#: lib/command.php:190
msgid "Notice marked as fave."
@@ -4449,7 +4961,7 @@ msgstr "ã‚ãªãŸã¯æ—¢ã«ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚加ã—ã¦ã„ã¾ã™ã€‚"
#: lib/command.php:231
#, php-format
msgid "Could not join user %s to group %s"
-msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã§ãã¾ã›ã‚“"
+msgstr "ユーザ %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã§ãã¾ã›ã‚“"
#: lib/command.php:236
#, php-format
@@ -4459,7 +4971,7 @@ msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã—ã¾ã—ãŸ"
#: lib/command.php:275
#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
+msgstr "ユーザ %s をグループ %s ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: lib/command.php:280
#, php-format
@@ -4533,79 +5045,89 @@ msgstr "ã¤ã¶ã‚„ãä¿å­˜ã‚¨ãƒ©ãƒ¼ã€‚"
#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr "フォローã™ã‚‹åˆ©ç”¨è€…ã®åå‰ã‚’指定ã—ã¦ãã ã•ã„"
+msgstr "フォローã™ã‚‹ãƒ¦ãƒ¼ã‚¶ã®åå‰ã‚’指定ã—ã¦ãã ã•ã„"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "ãã®ã‚ˆã†ãªãƒ¦ãƒ¼ã‚¶ã¯ã„ã¾ã›ã‚“。"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%s をフォローã—ã¾ã—ãŸ"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "フォローをやã‚るユーザã®åå‰ã‚’指定ã—ã¦ãã ã•ã„"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s ã®ãƒ•ォローをやã‚ã‚‹"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "コマンドã¯ã¾ã å®Ÿè£…ã•れã¦ã„ã¾ã›ã‚“。"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "通知オフ。"
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "通知をオフã§ãã¾ã›ã‚“。"
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "通知オン。"
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "通知をオンã§ãã¾ã›ã‚“。"
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "ログインコマンドãŒç„¡åйã«ãªã£ã¦ã„ã¾ã™ã€‚"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "ã“ã®ãƒªãƒ³ã‚¯ã¯ã€ã‹ã¤ã¦ã ã‘使用å¯èƒ½ã§ã‚りã€2分間ã ã‘良ã„ã§ã™: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s ã®ãƒ•ォローをやã‚ã‚‹"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "ã‚ãªãŸã¯ã ã‚Œã«ã‚‚フォローã•れã¦ã„ã¾ã›ã‚“。"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "ã‚ãªãŸã¯ã“ã®äººã«ãƒ•ォローã•れã¦ã„ã¾ã™:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "誰もフォローã—ã¦ã„ã¾ã›ã‚“。"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "ã“ã®äººã¯ã‚ãªãŸã«ãƒ•ォローã•れã¦ã„ã‚‹:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "ã‚ãªãŸã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã‚‚ã‚りã¾ã›ã‚“。"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "ã‚ãªãŸã¯ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚りã¾ã›ã‚“:"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4619,6 +5141,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4646,21 +5169,21 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "コンフィギュレーションファイルãŒã‚りã¾ã›ã‚“。 "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "ç§ã¯ä»¥ä¸‹ã®å ´æ‰€ã§ã‚³ãƒ³ãƒ•ィギュレーションファイルを探ã—ã¾ã—ãŸ: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
"ã‚ãªãŸã¯ã€ã“れを修ç†ã™ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’å‹•ã‹ã—ãŸãŒã£ã¦ã„ã‚‹ã‹ã‚‚ã—れã¾ã›"
"ん。"
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "インストーラã¸ã€‚"
@@ -4676,6 +5199,14 @@ msgstr "インスタントメッセンジャー(IM)ã§ã®æ›´æ–°"
msgid "Updates by SMS"
msgstr "SMSã§ã®æ›´æ–°"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "接続"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "承èªã•ã‚ŒãŸæŽ¥ç¶šã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "データベースエラー"
@@ -4785,7 +5316,7 @@ msgstr "ブロック"
#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
-msgstr "%s ブロック利用者"
+msgstr "%s ブロックユーザ"
#: lib/groupnav.php:108
#, php-format
@@ -4817,7 +5348,7 @@ msgstr "投稿ãŒå¤šã„グループ"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "%s グループã®é€šçŸ¥ã«ã‚ã‚‹ã‚¿ã‚°"
+msgstr "%s グループã®ã¤ã¶ã‚„ãã«ã‚ã‚‹ã‚¿ã‚°"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
@@ -4860,15 +5391,15 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "䏿˜Žãªè¨€èªž \"%s\""
+msgstr "䏿˜Žãªå—ä¿¡ç®±ã®ã‚½ãƒ¼ã‚¹ %d。"
#: lib/joinform.php:114
msgid "Join"
@@ -4910,7 +5441,7 @@ msgstr ""
"\n"
"ã ã‚Œã‹ãŒã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ %s ã«å…¥åŠ›ã—ã¾ã—ãŸã€‚\n"
"\n"
-"ã‚‚ã—エントリーを確èªã—ãŸã„ãªã‚‰ã€ä»¥ä¸‹ã®URLを使用ã—ã¦ãã ã•ã„:\n"
+"ã‚‚ã—登録を承èªã—ãŸã„ãªã‚‰ã€ä»¥ä¸‹ã®URLを使用ã—ã¦ãã ã•ã„:\n"
"\n"
"%s\n"
"\n"
@@ -5134,18 +5665,18 @@ msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr "利用者ã ã‘ãŒãれら自身ã®ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã‚’読むã“ã¨ãŒã§ãã¾ã™ã€‚"
+msgstr "ユーザã ã‘ãŒã‹ã‚Œã‚‰è‡ªèº«ã®ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã‚’読むã“ã¨ãŒã§ãã¾ã™ã€‚"
#: lib/mailbox.php:139
msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-"ã‚ãªãŸã«ã¯ã€ãƒ—ライベートメッセージãŒå…¨ãã‚りã¾ã›ã‚“。ã‚ãªãŸã¯ä»–ã®åˆ©ç”¨è€…を会話"
+"ã‚ãªãŸã«ã¯ã€ãƒ—ライベートメッセージãŒå…¨ãã‚りã¾ã›ã‚“。ã‚ãªãŸã¯ä»–ã®ãƒ¦ãƒ¼ã‚¶ã‚’会話"
"ã«å¼•ã込むプライベートメッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚人々ã¯ã‚ãªãŸã ã‘ã¸ã®"
"メッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "from"
@@ -5266,61 +5797,59 @@ msgid "Do not share my location"
msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有ã—ãªã„"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "ã“ã®æƒ…報を隠ã™"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"ã™ã¿ã¾ã›ã‚“ã€ã‚ãªãŸã®ä½ç½®ã‚’検索ã™ã‚‹ã®ãŒäºˆæƒ³ã‚ˆã‚Šé•·ãã‹ã‹ã£ã¦ã„ã¾ã™ã€å¾Œã§ã‚‚ã†ä¸€"
+"度試ã¿ã¦ãã ã•ã„"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "北"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "S"
msgstr "å—"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "E"
msgstr "æ±"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "W"
msgstr "西"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "at"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãã¸è¿”ä¿¡"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "返信"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "ã¤ã¶ã‚„ãを繰り返ã—ã¾ã—ãŸ"
@@ -5352,11 +5881,7 @@ msgstr "リモートプロファイル追加エラー"
msgid "Duplicate notice"
msgstr "é‡è¤‡ã—ãŸã¤ã¶ã‚„ã"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "ã‚ãªãŸã¯ãƒ•ォローãŒç¦æ­¢ã•れã¾ã—ãŸã€‚"
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "サブスクリプションを追加ã§ãã¾ã›ã‚“"
@@ -5372,19 +5897,19 @@ msgstr "返信"
msgid "Favorites"
msgstr "ãŠæ°—ã«å…¥ã‚Š"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "å—ä¿¡ç®±"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "ã‚ãªãŸã®å…¥ã£ã¦ãるメッセージ"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "é€ä¿¡ç®±"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "ã‚ãªãŸãŒé€ã£ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
@@ -5415,11 +5940,11 @@ msgstr "ã™ã¹ã¦ã®ãƒ•ォローã•れã¦ã„ã‚‹"
#: lib/profileaction.php:178
msgid "User ID"
-msgstr "利用者ID"
+msgstr "ユーザID"
#: lib/profileaction.php:183
msgid "Member since"
-msgstr "ã‹ã‚‰ã®ãƒ¡ãƒ³ãƒãƒ¼"
+msgstr "利用開始日"
#: lib/profileaction.php:245
msgid "All groups"
@@ -5461,6 +5986,10 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãを繰り返ã—ã¾ã™ã‹?"
msgid "Repeat this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãを繰り返ã™"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "single-user モードã®ãŸã‚ã®ã‚·ãƒ³ã‚°ãƒ«ãƒ¦ãƒ¼ã‚¶ãŒå®šç¾©ã•れã¦ã„ã¾ã›ã‚“。"
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "サンドボックス"
@@ -5528,34 +6057,6 @@ msgstr "人々㯠%s をフォローã—ã¾ã—ãŸã€‚"
msgid "Groups %s is a member of"
msgstr "グループ %s ã¯ãƒ¡ãƒ³ãƒãƒ¼"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "ã™ã§ã«ãƒ•ォローã—ã¦ã„ã¾ã™!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "利用者ã¯ã‚ãªãŸã‚’ブロックã—ã¾ã—ãŸã€‚"
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "フォローã§ãã¾ã›ã‚“。"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "ä»–ã®äººãŒã‚ãªãŸã‚’フォローã§ãã¾ã›ã‚“。"
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "フォローã—ã¦ã„ã¾ã›ã‚“ï¼"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "自己フォローを削除ã§ãã¾ã›ã‚“。"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "フォローを削除ã§ãã¾ã›ã‚“"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5592,7 +6093,7 @@ msgstr "ã“ã®åˆ©ç”¨è€…をアンサイレンス"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰ã®ãƒ•ォローを解除ã™ã‚‹"
+msgstr "ã“ã®åˆ©ç”¨è€…ã‹ã‚‰ã®ãƒ•ォローを解除ã™ã‚‹"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
@@ -5606,68 +6107,68 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ã‚’編集ã™ã‚‹"
msgid "User actions"
msgstr "利用者アクション"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "プロファイル設定編集"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "編集"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "ã“ã®åˆ©ç”¨è€…ã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "メッセージ"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
#, fuzzy
msgid "Moderate"
-msgstr "å¸ä¼š"
+msgstr "管ç†"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "æ•°ç§’å‰"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "ç´„ 1 分å‰"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "ç´„ %d 分å‰"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "ç´„ 1 時間å‰"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "ç´„ %d 時間å‰"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "ç´„ 1 æ—¥å‰"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "ç´„ %d æ—¥å‰"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "ç´„ 1 ヵ月å‰"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "ç´„ %d ヵ月å‰"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "ç´„ 1 å¹´å‰"
@@ -5681,7 +6182,7 @@ msgstr "%sã¯æœ‰åйãªè‰²ã§ã¯ã‚りã¾ã›ã‚“!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s ã¯æœ‰åйãªè‰²ã§ã¯ã‚りã¾ã›ã‚“! 3ã‹6ã®16進数を使ã£ã¦ãã ã•ã„。"
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "メッセージãŒé•·ã™ãŽã¾ã™ - 最大 %1$d å­—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %2$d。"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index f37715eca..1653bf31b 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,17 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:40+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:15+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "수ë½"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "아바타 설정"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "회ì›ê°€ìž…"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "ê°œì¸ì •ë³´ 취급방침"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "초대"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "차단하기"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "저장"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "아바타 설정"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -33,25 +92,29 @@ msgstr "그러한 태그가 없습니다."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "그러한 사용ìžëŠ” 없습니다."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s 와 친구들, %d 페ì´ì§€"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,7 +155,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s ë° ì¹œêµ¬ë“¤"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íЏ!"
@@ -115,23 +178,23 @@ msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íЏ!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다."
@@ -146,7 +209,7 @@ msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "ì´ ë©”ì„œë“œëŠ” 등ë¡ì„ 요구합니다."
@@ -177,8 +240,9 @@ msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í•  수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -299,12 +363,12 @@ msgstr "사용ìžë¥¼ ì—…ë°ì´íЏ í•  수 없습니다."
msgid "Two user ids or screen_names must be supplied."
msgstr "ë‘ ê°œì˜ ì‚¬ìš©ìž ID나 ëŒ€í™”ëª…ì„ ìž…ë ¥í•´ì•¼ 합니다."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "공개 streamì„ ë¶ˆëŸ¬ì˜¬ 수 없습니다."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "어떠한 ìƒíƒœë„ ì°¾ì„ ìˆ˜ 없습니다."
@@ -329,7 +393,8 @@ msgstr "ë³„ëª…ì´ ì´ë¯¸ 사용중 입니다. 다른 ë³„ëª…ì„ ì‹œë„í•´ ë³´ì‹­ì
msgid "Not a valid nickname."
msgstr "유효한 ë³„ëª…ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -341,7 +406,8 @@ msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다."
msgid "Full name is too long (max 255 chars)."
msgstr "ì‹¤ëª…ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 255글ìž)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "ì„¤ëª…ì´ ë„ˆë¬´ 길어요. (최대 140글ìž)"
@@ -377,7 +443,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다."
@@ -421,6 +487,115 @@ msgstr "%s 그룹"
msgid "groups on %s"
msgstr "그룹 í–‰ë™"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "옳지 ì•Šì€ í¬ê¸°"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "세션토í°ì— 문제가 있습니다. 다시 시ë„해주세요."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "ì‚¬ìš©ìž ì´ë¦„ì´ë‚˜ 비밀 번호가 틀렸습니다."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "ì‚¬ìš©ìž ì„¸íŒ… 오류"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "해쉬테그를 추가 í•  ë•Œì— ë°ì´íƒ€ë² ì´ìФ ì—러 : %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "ìž˜ëª»ëœ í¼ ì œì¶œ"
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "계정"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "별명"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "비밀 번호"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "모든 것"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "ì´ ë©”ì„œë“œëŠ” ë“±ë¡ ë˜ëŠ” 삭제를 요구합니다."
@@ -453,17 +628,17 @@ msgstr "아바타가 ì—…ë°ì´íЏ ë˜ì—ˆìŠµë‹ˆë‹¤."
msgid "No status with that ID found."
msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” 140ê¸€ìž ìž…ë‹ˆë‹¤."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "찾지 못함"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -478,7 +653,7 @@ msgstr "ì§€ì›í•˜ì§€ 않는 그림 íŒŒì¼ í˜•ì‹ìž…니다."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / %sì˜ ì¢‹ì•„í•˜ëŠ” 글들"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 좋아하는 ê¸€ì´ ì—…ë°ì´íЏ ë습니다. %Sì— ì˜í•´ / %s."
@@ -489,7 +664,7 @@ msgstr "%s 좋아하는 ê¸€ì´ ì—…ë°ì´íЏ ë습니다. %Sì— ì˜í•´ / %s."
msgid "%s timeline"
msgstr "%s 타임ë¼ì¸"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -505,27 +680,22 @@ msgstr "%1$s / %2$sì—게 답신 ì—…ë°ì´íЏ"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$së‹˜ì´ %2$s/%3$sì˜ ì—…ë°ì´íŠ¸ì— ë‹µë³€í–ˆìŠµë‹ˆë‹¤."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 공개 타임ë¼ì¸"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "모ë‘ë¡œë¶€í„°ì˜ ì—…ë°ì´íЏ %sê°œ!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "%sì— ë‹µì‹ "
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%sì— ë‹µì‹ "
@@ -535,7 +705,7 @@ msgstr "%sì— ë‹µì‹ "
msgid "Notices tagged with %s"
msgstr "%s íƒœê·¸ëœ í†µì§€"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$sì— ìžˆëŠ” %1$sì˜ ì—…ë°ì´íЏ!"
@@ -596,8 +766,8 @@ msgstr "ì›ëž˜ 설정"
msgid "Preview"
msgstr "미리보기"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "삭제"
@@ -609,29 +779,6 @@ msgstr "올리기"
msgid "Crop"
msgstr "ìžë¥´ê¸°"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "세션토í°ì— 문제가 있습니다. 다시 시ë„해주세요."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "ìž˜ëª»ëœ í¼ ì œì¶œ"
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "ë‹¹ì‹ ì˜ ì•„ë°”íƒ€ê°€ ë  ì´ë¯¸ì§€ì˜ì—­ì„ 지정하세요."
@@ -669,8 +816,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "아니오"
@@ -679,13 +827,13 @@ msgstr "아니오"
msgid "Do not block this user"
msgstr "ì´ ì‚¬ìš©ìžë¥¼ 차단해제합니다."
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "네, 맞습니다."
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "ì´ ì‚¬ìš©ìž ì°¨ë‹¨í•˜ê¸°"
@@ -771,7 +919,8 @@ msgid "Couldn't delete email confirmation."
msgstr "ì´ë©”ì¼ ìŠ¹ì¸ì„ ì‚­ì œ í•  수 없습니다."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "주소 ì¸ì¦"
#: actions/confirmaddress.php:159
@@ -789,10 +938,54 @@ msgstr "ì¸ì¦ 코드"
msgid "Notices"
msgstr "통지"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "그러한 통지는 없습니다."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "ì´ í†µì§€ë¥¼ 지울 수 없습니다."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "ì´ ê²Œì‹œê¸€ 삭제하기"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -824,7 +1017,7 @@ msgstr "ì •ë§ë¡œ 통지를 삭제하시겠습니까?"
msgid "Do not delete this notice"
msgstr "ì´ í†µì§€ë¥¼ 지울 수 없습니다."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "ì´ ê²Œì‹œê¸€ 삭제하기"
@@ -966,16 +1159,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "저장"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -988,10 +1171,87 @@ msgstr "ì´ ë©”ì‹œì§€ëŠ” favoriteì´ ì•„ë‹™ë‹ˆë‹¤."
msgid "Add to favorites"
msgstr "좋아하는 게시글로 추가하기"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "그러한 문서는 없습니다."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "다른 옵션들"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "그러한 통지는 없습니다."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "ë‹¤ìŒ ì–‘ì‹ì„ ì´ìš©í•´ ê·¸ë£¹ì„ íŽ¸ì§‘í•˜ì‹­ì‹œì˜¤."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "위와 ê°™ì€ ë¹„ë°€ 번호. 필수 사항."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "ì‹¤ëª…ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 255글ìž)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "ë³„ëª…ì´ ì´ë¯¸ 사용중 입니다. 다른 ë³„ëª…ì„ ì‹œë„í•´ 보십시오."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "설명"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "위치가 너무 ê¹ë‹ˆë‹¤. (최대 255글ìž)"
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "ê·¸ë£¹ì„ ì—…ë°ì´íЏ í•  수 없습니다."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1020,7 +1280,7 @@ msgstr "ì„¤ëª…ì´ ë„ˆë¬´ 길어요. (최대 140글ìž)"
msgid "Could not update group."
msgstr "ê·¸ë£¹ì„ ì—…ë°ì´íЏ í•  수 없습니다."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "좋아하는 ê²Œì‹œê¸€ì„ ìƒì„±í•  수 없습니다."
@@ -1063,7 +1323,8 @@ msgstr ""
"주시기 ë°”ëžë‹ˆë‹¤."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "취소"
@@ -1145,7 +1406,7 @@ msgid "Cannot normalize that email address"
msgstr "ê·¸ ì´ë©”ì¼ ì£¼ì†Œë¥¼ 정규화 í•  수 없습니다."
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "유효한 ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다."
@@ -1157,7 +1418,7 @@ msgstr "ê·¸ ì´ë©”ì¼ ì£¼ì†ŒëŠ” ì´ë¯¸ ê·€í•˜ì˜ ê²ƒìž…ë‹ˆë‹¤."
msgid "That email address already belongs to another user."
msgstr "ê·¸ ì´ë©”ì¼ ì£¼ì†ŒëŠ” ì´ë¯¸ 다른 사용ìžì˜ 소유입니다."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "í™•ì¸ ì½”ë“œë¥¼ 추가 í•  수 없습니다."
@@ -1218,7 +1479,7 @@ msgstr "ì´ ê²Œì‹œê¸€ì€ ì´ë¯¸ 좋아하는 게시글입니다."
msgid "Disfavor favorite"
msgstr "좋아하는글 취소"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "ì¸ê¸°ìžˆëŠ” 게시글"
@@ -1373,7 +1634,7 @@ msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
msgid "User is not a member of group."
msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "사용ìžë¥¼ 차단합니다."
@@ -1474,25 +1735,25 @@ msgstr "%s 그룹 회ì›, %d페ì´ì§€"
msgid "A list of the users in this group."
msgstr "ì´ ê·¸ë£¹ì˜ íšŒì›ë¦¬ìŠ¤íŠ¸"
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "관리ìž"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "차단하기"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
#, fuzzy
msgid "Make user an admin of the group"
msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í•  수 있습니다."
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
#, fuzzy
msgid "Make Admin"
msgstr "관리ìž"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1667,6 +1928,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "ê·¸ Jabber ID는 ê·€í•˜ì˜ ê²ƒì´ ì•„ë‹™ë‹ˆë‹¤."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%sì˜ ë°›ì€ìª½ì§€í•¨"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1745,7 +2011,7 @@ msgstr "ê°œì¸ì ì¸ 메시지"
msgid "Optionally add a personal message to the invitation."
msgstr "ì´ˆëŒ€ìž¥ì— ë©”ì‹œì§€ 첨부하기."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "보내기"
@@ -1841,7 +2107,7 @@ msgstr "틀린 계정 ë˜ëŠ” 비밀 번호"
msgid "Error setting user. You are probably not authorized."
msgstr "ì¸ì¦ì´ ë˜ì§€ 않았습니다."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그ì¸"
@@ -1850,17 +2116,6 @@ msgstr "로그ì¸"
msgid "Login to site"
msgstr "사ì´íŠ¸ì— ë¡œê·¸ì¸í•˜ì„¸ìš”."
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "별명"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "비밀 번호"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "ìžë™ 로그ì¸"
@@ -1890,21 +2145,21 @@ msgstr ""
"action.register%%) 새 ê³„ì •ì„ ìƒì„± ë˜ëŠ” [OpenID](%%action.openidlogin%%)를 사"
"용해 보세요."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "그룹 %sì—서 %s 사용ìžë¥¼ 제거할 수 없습니다."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í•  수 있습니다."
@@ -1913,6 +2168,30 @@ msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í•  수 있습니다."
msgid "No current status"
msgstr "현재 ìƒíƒœê°€ 없습니다."
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "그러한 통지는 없습니다."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "새 ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해 ì´ ì–‘ì‹ì„ 사용하세요."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "좋아하는 ê²Œì‹œê¸€ì„ ìƒì„±í•  수 없습니다."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "새로운 그룹"
@@ -2022,6 +2301,51 @@ msgstr "찔러 보기를 보냈습니다."
msgid "Nudge sent!"
msgstr "찔러 보기를 보냈습니다!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "다른 옵션들"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
@@ -2040,8 +2364,8 @@ msgstr "ì—°ê²°"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "ì§€ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다."
@@ -2054,7 +2378,8 @@ msgid "Notice Search"
msgstr "통지 검색"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "기타 설정"
#: actions/othersettings.php:71
@@ -2111,6 +2436,11 @@ msgstr "옳지 ì•Šì€ í†µì§€ ë‚´ìš©"
msgid "Login token expired."
msgstr "사ì´íŠ¸ì— ë¡œê·¸ì¸í•˜ì„¸ìš”."
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "%sì˜ ë³´ë‚¸ìª½ì§€í•¨"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2181,7 +2511,7 @@ msgstr "새 비밀번호를 저장 할 수 없습니다."
msgid "Password saved."
msgstr "비밀 번호 저장"
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2189,142 +2519,159 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "ì´ íŽ˜ì´ì§€ëŠ” 귀하가 승ì¸í•œ 미디어 타입ì—서는 ì´ìš©í•  수 없습니다."
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "초대"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "복구"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "사ì´íЏ 공지"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "아바타"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "아바타 설정"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "아바타가 ì—…ë°ì´íЏ ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "아바타가 ì—…ë°ì´íЏ ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "복구"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "통지"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "복구"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "사ì´íЏ 공지"
@@ -2387,7 +2734,7 @@ msgid "Full name"
msgstr "실명"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "홈페ì´ì§€"
@@ -2411,7 +2758,7 @@ msgstr "ìžê¸°ì†Œê°œ"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "위치"
@@ -2435,7 +2782,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "ë‹¹ì‹ ì„ ìœ„í•œ 태그, (문ìž,숫ìž,-, ., _로 구성) 콤마 í˜¹ì€ ê³µë°±ìœ¼ë¡œ 구분."
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "언어"
@@ -2461,7 +2808,7 @@ msgstr "나ì—게 구ë…하는 사람ì—게 ìžë™ êµ¬ë… ì‹ ì²­"
msgid "Bio is too long (max %d chars)."
msgstr "ìžê¸°ì†Œê°œê°€ 너무 ê¹ë‹ˆë‹¤. (최대 140글ìž)"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "íƒ€ìž„ì¡´ì´ ì„¤ì • ë˜ì§€ 않았습니다."
@@ -2474,24 +2821,24 @@ msgstr "언어가 너무 ê¹ë‹ˆë‹¤. (최대 50글ìž)"
msgid "Invalid tag: \"%s\""
msgstr "유효하지 않ì€íƒœê·¸: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "ìžë™êµ¬ë…ì— ì‚¬ìš©ìžë¥¼ ì—…ë°ì´íЏ í•  수 없습니다."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "태그를 저장할 수 없습니다."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í•  수 없습니다."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "태그를 저장할 수 없습니다."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "설정 저장"
@@ -2513,39 +2860,39 @@ msgstr "공개 타임ë¼ì¸, %d 페ì´ì§€"
msgid "Public timeline"
msgstr "í¼ë¸”릭 타임ë¼ì¸"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "í¼ë¸”릭 스트림 피드"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "í¼ë¸”릭 스트림 피드"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "í¼ë¸”릭 스트림 피드"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2554,7 +2901,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2589,7 +2936,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "태그 í´ë¼ìš°ë“œ"
@@ -2727,7 +3074,7 @@ msgstr "í™•ì¸ ì½”ë“œ 오류"
msgid "Registration successful"
msgstr "íšŒì› ê°€ìž…ì´ ì„±ê³µì ìž…니다."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "회ì›ê°€ìž…"
@@ -2769,7 +3116,7 @@ msgid "Same as password above. Required."
msgstr "위와 ê°™ì€ ë¹„ë°€ 번호. 필수 사항."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "ì´ë©”ì¼"
@@ -2874,7 +3221,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "다른 마ì´í¬ë¡œë¸”로깅 ì„œë¹„ìŠ¤ì˜ ê·€í•˜ì˜ í”„ë¡œí•„ URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "구ë…"
@@ -2917,7 +3264,7 @@ msgstr "ë¼ì´ì„ ìŠ¤ì— ë™ì˜í•˜ì§€ 않는다면 등ë¡í•  수 없습니다."
msgid "You already repeated that notice."
msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ì‚¬ìš©ìžë¥¼ 차단하고 있습니다."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "ìƒì„±"
@@ -2933,6 +3280,11 @@ msgstr "ìƒì„±"
msgid "Replies to %s"
msgstr "%sì— ë‹µì‹ "
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%2$sì—서 %1$s까지 메시지"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2974,6 +3326,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%2$sì—서 %1$s까지 메시지"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "아바타가 ì—…ë°ì´íЏ ë˜ì—ˆìŠµë‹ˆë‹¤."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2984,6 +3341,125 @@ msgstr "ë‹¹ì‹ ì€ ì´ ì‚¬ìš©ìžì—게 메시지를 보낼 수 없습니다."
msgid "User is already sandboxed."
msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "아바타 설정"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "ê·¸ë£¹ì„ ë– ë‚˜ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "별명"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "페ì´ì§€ìˆ˜"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "설명"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "통계"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "ì •ë§ë¡œ 통지를 삭제하시겠습니까?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s ë‹˜ì˜ ì¢‹ì•„í•˜ëŠ” 글들"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "좋아하는 ê²Œì‹œê¸€ì„ ë³µêµ¬í•  수 없습니다."
@@ -3033,17 +3509,22 @@ msgstr ""
msgid "%s group"
msgstr "%s 그룹"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%s 그룹 회ì›, %d페ì´ì§€"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "그룹 프로필"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "설명"
@@ -3089,10 +3570,6 @@ msgstr "(없습니다.)"
msgid "All members"
msgstr "모든 회ì›"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "통계"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3152,6 +3629,11 @@ msgstr "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤."
msgid " tagged %s"
msgstr "%s íƒœê·¸ëœ í†µì§€"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s 와 친구들, %d 페ì´ì§€"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3177,25 +3659,25 @@ msgstr "%sì˜ í†µì§€ 피드"
msgid "FOAF for %s"
msgstr "%sì˜ ë³´ë‚¸ìª½ì§€í•¨"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3204,7 +3686,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3214,7 +3696,7 @@ msgstr ""
"**%s**는 %%%%site.name%%%% [마ì´í¬ë¡œë¸”로깅](http://en.wikipedia.org/wiki/"
"Micro-blogging) ì„œë¹„ìŠ¤ì— ê³„ì •ì„ ê°–ê³  있습니다."
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "%sì— ë‹µì‹ "
@@ -3233,207 +3715,148 @@ msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "유효한 ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "사ì´íЏ 공지"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "%sì— í¬ìŠ¤íŒ… í•  새로운 ì´ë©”ì¼ ì£¼ì†Œ"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "로컬 뷰"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "언어 설정"
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "복구"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "수ë½"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "ê°œì¸ì •ë³´ 취급방침"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "초대"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "차단하기"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "아바타 설정"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3539,15 +3962,26 @@ msgstr "코드가 ìž…ë ¥ ë˜ì§€ 않았습니다."
msgid "You are not subscribed to that profile."
msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ 않고있습니다."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "구ë…ì„ ì €ìž¥í•  수 없습니다."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "로컬 ì‚¬ìš©ìž ì•„ë‹™ë‹ˆë‹¤."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "그러한 통지는 없습니다."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ 않고있습니다."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "구ë…하였습니다."
@@ -3607,7 +4041,7 @@ msgstr "ê·€í•˜ì˜ í†µì§€ë¥¼ 받고 있는 사람"
msgid "These are the people whose notices %s listens to."
msgstr "%së‹˜ì´ ë°›ê³  있는 í†µì§€ì˜ ì‚¬ëžŒ"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3617,19 +4051,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s 는 지금 듣고 있습니다."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "ì´ìš©ìž 셀프 í…Œí¬ %s - %d 페ì´ì§€"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3659,7 +4098,8 @@ msgstr "태그 %s"
msgid "User profile"
msgstr "ì´ìš©ìž 프로필"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "사진"
@@ -3720,7 +4160,7 @@ msgstr "요청한 프로필id가 없습니다."
msgid "Unsubscribed"
msgstr "구ë…취소 ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3735,89 +4175,69 @@ msgstr "ì´ìš©ìž"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "프로필"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "새 사용ìžë¥¼ 초대"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "모든 예약 구ë…"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "나ì—게 구ë…하는 사람ì—게 ìžë™ êµ¬ë… ì‹ ì²­"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "ì´ˆëŒ€ê¶Œì„ ë³´ëƒˆìŠµë‹ˆë‹¤"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "ì´ˆëŒ€ê¶Œì„ ë³´ëƒˆìŠµë‹ˆë‹¤"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "구ë…ì„ í—ˆê°€"
@@ -3832,38 +4252,38 @@ msgstr ""
"사용ìžì˜ 통지를 구ë…하려면 ìƒì„¸ë¥¼ 확ì¸í•´ 주세요. 구ë…하지 않는 경우는, \"취소"
"\"를 í´ë¦­í•´ 주세요."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
#, fuzzy
msgid "License"
msgstr "ë¼ì´ì„ ìФ"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "수ë½"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "ì´ íšŒì›ì„ 구ë…합니다."
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "ê±°ë¶€"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "%s 구ë…"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "허용ë˜ì§€ 않는 요청입니다."
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "êµ¬ë… í—ˆê°€"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3873,11 +4293,11 @@ msgstr ""
"구ë…ì´ ìŠ¹ì¸ ë˜ì—ˆìŠµë‹ˆë‹¤. 하지만 콜백 URLì´ í†µê³¼ ë˜ì§€ 않았습니다. 웹사ì´íŠ¸ì˜ ì§€"
"시를 찾아 êµ¬ë… ìŠ¹ì¸ ë°©ë²•ì— ëŒ€í•˜ì—¬ ì½ì–´ë³´ì‹­ì‹œì˜¤. ê·€í•˜ì˜ êµ¬ë… í† í°ì€ : "
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "êµ¬ë… ê±°ë¶€"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3887,37 +4307,37 @@ msgstr ""
"구ë…ì´ í•´ì§€ ë˜ì—ˆìŠµë‹ˆë‹¤. 하지만 콜백 URLì´ í†µê³¼ ë˜ì§€ 않았습니다. 웹사ì´íŠ¸ì˜ ì§€"
"시를 찾아 êµ¬ë… í•´ì§€ ë°©ë²•ì— ëŒ€í•˜ì—¬ ì½ì–´ë³´ì‹­ì‹œì˜¤."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "아바타 URL '%s'ì„(를) ì½ì–´ë‚¼ 수 없습니다."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "%S ìž˜ëª»ëœ ê·¸ë¦¼ íŒŒì¼ íƒ€ìž…ìž…ë‹ˆë‹¤. "
@@ -3937,6 +4357,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%s 그룹 회ì›, %d페ì´ì§€"
+
#: actions/usergroups.php:130
#, fuzzy
msgid "Search for more groups"
@@ -3964,11 +4389,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "아바타가 ì—…ë°ì´íЏ ë˜ì—ˆìŠµë‹ˆë‹¤."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4000,12 +4420,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "별명"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "ê°œì¸ì ì¸"
@@ -4014,10 +4429,6 @@ msgstr "ê°œì¸ì ì¸"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "설명"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4068,28 +4479,28 @@ msgstr "메시지를 삽입할 수 없습니다."
msgid "Could not update message with new URI."
msgstr "새 URI와 함께 메시지를 ì—…ë°ì´íŠ¸í•  수 없습니다."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "해쉬테그를 추가 í•  ë•Œì— ë°ì´íƒ€ë² ì´ìФ ì—러 : %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "게시글 저장문제. ì•Œë ¤ì§€ì§€ì•Šì€ íšŒì›"
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"너무 ë§Žì€ ê²Œì‹œê¸€ì´ ë„ˆë¬´ 빠르게 올ë¼ì˜µë‹ˆë‹¤. 한숨고르고 ëª‡ë¶„í›„ì— ë‹¤ì‹œ í¬ìŠ¤íŠ¸ë¥¼ "
"해보세요."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4098,34 +4509,61 @@ msgstr ""
"너무 ë§Žì€ ê²Œì‹œê¸€ì´ ë„ˆë¬´ 빠르게 올ë¼ì˜µë‹ˆë‹¤. 한숨고르고 ëª‡ë¶„í›„ì— ë‹¤ì‹œ í¬ìŠ¤íŠ¸ë¥¼ "
"해보세요."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "ì´ ì‚¬ì´íŠ¸ì— ê²Œì‹œê¸€ í¬ìŠ¤íŒ…ìœ¼ë¡œë¶€í„° ë‹¹ì‹ ì€ ê¸ˆì§€ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "ë‹µì‹ ì„ ì¶”ê°€ í•  ë•Œì— ë°ì´íƒ€ë² ì´ìФ ì—러 : %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "ì´ íšŒì›ì€ 구ë…으로부터 ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ë‹¤."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "구ë…하고 있지 않습니다!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%2$sì—서 %1$s까지 메시지"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "새 ê·¸ë£¹ì„ ë§Œë“¤ 수 없습니다."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "그룹 ë§´ë²„ì‹­ì„ ì„¸íŒ…í•  수 없습니다."
@@ -4167,131 +4605,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "제목없는 페ì´ì§€"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "주 사ì´íЏ 네비게ì´ì…˜"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "홈"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "ê°œì¸ í”„ë¡œí•„ê³¼ 친구 타임ë¼ì¸"
-#: lib/action.php:435
-msgid "Account"
-msgstr "계정"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "ë‹¹ì‹ ì˜ ì´ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”."
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "ì—°ê²°"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "ì„œë²„ì— ìž¬ì ‘ì† í•  수 없습니다 : %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "주 사ì´íЏ 네비게ì´ì…˜"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "초대"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "%sì— ì¹œêµ¬ë¥¼ 가입시키기 위해 친구와 ë™ë£Œë¥¼ 초대합니다."
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "로그아웃"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "ì´ ì‚¬ì´íŠ¸ë¡œë¶€í„° 로그아웃"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "계정 만들기"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "ì´ ì‚¬ì´íЏ 로그ì¸"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "ë„움ë§"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "ë„ì›€ì´ í•„ìš”í•´!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "검색"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "프로필ì´ë‚˜ í…스트 검색"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "사ì´íЏ 공지"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "로컬 뷰"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "페ì´ì§€ 공지"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "ë³´ì¡° 사ì´íЏ 네비게ì´ì…˜"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "ì •ë³´"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "ìžì£¼ 묻는 질문"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "ê°œì¸ì •ë³´ 취급방침"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "소스 코드"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "ì—°ë½í•˜ê¸°"
-#: lib/action.php:745
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ ìФ"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4300,12 +4734,12 @@ msgstr ""
"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
"마ì´í¬ë¡œë¸”로깅서비스입니다."
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 는 마ì´í¬ë¡œë¸”로깅서비스입니다."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4316,34 +4750,56 @@ msgstr ""
"ì„ ì‚¬ìš©í•©ë‹ˆë‹¤. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì‚¬ìš©í•  수 있습니다."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ ìФ"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "모든 것"
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "ë¼ì´ì„ ìФ"
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "페ì´ì§€ìˆ˜"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "ë’· 페ì´ì§€"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "앞 페ì´ì§€"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4380,11 +4836,105 @@ msgstr "ì´ë©”ì¼ ì£¼ì†Œ 확ì¸ì„œ"
msgid "Design configuration"
msgstr "SMS ì¸ì¦"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS ì¸ì¦"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS ì¸ì¦"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS ì¸ì¦"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS ì¸ì¦"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "140글ìžë¡œ 그룹ì´ë‚˜ 토픽 설명하기"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "140글ìžë¡œ 그룹ì´ë‚˜ 토픽 설명하기"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "소스 코드"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "그룹 í˜¹ì€ í† í”½ì˜ í™ˆíŽ˜ì´ì§€ë‚˜ 블로그 URL"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "그룹 í˜¹ì€ í† í”½ì˜ í™ˆíŽ˜ì´ì§€ë‚˜ 블로그 URL"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "삭제"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4406,12 +4956,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "비밀번호 변경"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "비밀번호 변경"
@@ -4565,80 +5115,89 @@ msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
msgid "Specify the name of the user to subscribe to"
msgstr "구ë…하려는 사용ìžì˜ ì´ë¦„ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "그러한 사용ìžëŠ” 없습니다."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%sì—게 구ë…ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "구ë…ì„ í•´ì œí•˜ë ¤ëŠ” 사용ìžì˜ ì´ë¦„ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%sì—서 구ë…ì„ í•´ì œí–ˆìŠµë‹ˆë‹¤."
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "ëª…ë ¹ì´ ì•„ì§ ì‹¤í–‰ë˜ì§€ 않았습니다."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "알림ë„기."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "ì•Œë¦¼ì„ ëŒ ìˆ˜ 없습니다."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "ì•Œë¦¼ì´ ì¼œì¡ŒìŠµë‹ˆë‹¤."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%sì—서 구ë…ì„ í•´ì œí–ˆìŠµë‹ˆë‹¤."
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ 않고있습니다."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "ë‹¹ì‹ ì€ ë‹¤ìŒ ì‚¬ìš©ìžë¥¼ ì´ë¯¸ 구ë…하고 있습니다."
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4652,6 +5211,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4679,20 +5239,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "í™•ì¸ ì½”ë“œê°€ 없습니다."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "ì´ ì‚¬ì´íЏ 로그ì¸"
@@ -4709,6 +5269,15 @@ msgstr "ì¸ìŠ¤í„´íŠ¸ ë©”ì‹ ì €ì— ì˜í•œ ì—…ë°ì´íЏ"
msgid "Updates by SMS"
msgstr "SMSì— ì˜í•œ ì—…ë°ì´íЏ"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "ì—°ê²°"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4896,12 +5465,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5104,7 +5673,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "다ìŒì—서:"
@@ -5223,60 +5792,56 @@ msgid "Do not share my location"
msgstr "태그를 저장할 수 없습니다."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "아니오"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "ìƒì„±"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "답장하기"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤."
@@ -5310,12 +5875,7 @@ msgstr "리모트 프로필 추가 오류"
msgid "Duplicate notice"
msgstr "통지 삭제"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "ì´ íšŒì›ì€ 구ë…으로부터 ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ë‹¤."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "예약 구ë…ì„ ì¶”ê°€ í•  수 없습니다."
@@ -5331,19 +5891,19 @@ msgstr "답신"
msgid "Favorites"
msgstr "좋아하는 글들"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "ë°›ì€ ìª½ì§€í•¨"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "ë‹¹ì‹ ì˜ ë°›ì€ ë©”ì‹œì§€ë“¤"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "보낸 쪽지함"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "ë‹¹ì‹ ì˜ ë³´ë‚¸ 메시지들"
@@ -5425,6 +5985,10 @@ msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기"
msgid "Repeat this notice"
msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5498,36 +6062,6 @@ msgstr "%sì— ì˜í•´ 구ë…ë˜ëŠ” 사람들"
msgid "Groups %s is a member of"
msgstr "%s ê·¸ë£¹ë“¤ì€ ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤."
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "êµ¬ë… í•˜ì‹¤ 수 없습니다."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "구ë…하고 있지 않습니다!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5581,68 +6115,68 @@ msgstr "아바타"
msgid "User actions"
msgstr "ì‚¬ìš©ìž ë™ìž‘"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "프로필 세팅"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "ì´ íšŒì›ì—게 ì§ì ‘ 메시지를 보냅니다."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "메시지"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "1ë¶„ ì „"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%dë¶„ ì „"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì „"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "1ë…„ ì „"
@@ -5656,7 +6190,7 @@ msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 4bda795f0..14efaf620 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,17 +9,71 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:43+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:18+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "ПриÑтап"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Ðагодувања за приÑтап на веб-Ñтраницата"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "РегиÑтрација"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Приватен"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Да им забранам на анонимните (ненајавени) кориÑници да ја гледаат веб-"
+"Ñтраницата?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Само Ñо покана"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "РегиÑтрирање Ñамо Ñо покана."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Затворен"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Оневозможи нови региÑтрации."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Зачувај"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Зачувај нагодувања на приÑтап"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +88,29 @@ msgstr "Ðема таква Ñтраница"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ðема таков кориÑник."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s и пријателите, Ñтр. %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -99,7 +157,7 @@ msgstr ""
"на кориÑникот или да [објавите нешто што Ñакате тој да го прочита](%%%%"
"action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -113,8 +171,8 @@ msgstr ""
msgid "You and friends"
msgstr "Вие и пријателите"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Подновувања од %1$s и пријатели на %2$s!"
@@ -124,23 +182,23 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API методот не е пронајден."
@@ -154,7 +212,7 @@ msgstr "API методот не е пронајден."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Овој метод бара POST."
@@ -185,8 +243,9 @@ msgstr "Ðе може да Ñе зачува профил."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -305,11 +364,11 @@ msgid "Two user ids or screen_names must be supplied."
msgstr ""
"Мора да бидат наведени два кориÑнички идентификатора (ID) или две имиња."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Ðе можев да го утврдам целниот кориÑник."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Ðе можев да го пронајдам целниот кориÑник."
@@ -331,7 +390,8 @@ msgstr "Тој прекар е во употреба. Одберете друг.
msgid "Not a valid nickname."
msgstr "Ðеправилен прекар."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -343,7 +403,8 @@ msgstr "Главната Ñтраница не е важечка URL-адреÑÐ
msgid "Full name is too long (max 255 chars)."
msgstr "Целото име е предолго (макÑимум 255 знаци)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ОпиÑот е предолг (дозволено е највеќе %d знаци)."
@@ -379,7 +440,7 @@ msgstr "ÐлијаÑот не може да биде иÑÑ‚ како прекаÑ
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Групата не е пронајдена!"
@@ -420,6 +481,115 @@ msgstr "%s групи"
msgid "groups on %s"
msgstr "групи на %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Ðема наведено oauth_token параметар."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Погрешен жетон."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Се поајви проблем Ñо Вашиот ÑеÑиÑки жетон. Обидете Ñе повторно."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Погрешен прекар / лозинка!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Грешка при бришењето на кориÑникот на OAuth-програмот."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Грешка во базата на податоци при вметнувањето на кориÑникот на OAuth-"
+"програмот."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr "Жетонот на барањето %s е одобрен. Заменете го Ñо жетон за приÑтап."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Жетонот на барањето %s е одбиен и поништен."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Ðеочекувано поднеÑување на образец."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Има програм кој Ñака да Ñе поврзе Ñо Вашата Ñметка"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Дозволи или одбиј приÑтап"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Програмот <strong>%1$s</strong> од <strong>%2$s</strong> би Ñакал да може да "
+"<strong>%3$s</strong> податоците за Вашата %4$s Ñметка. Треба да дозволувате "
+"приÑтап до Вашата %4$s Ñметка Ñамо на трети Ñтрани на кои им верувате."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Сметка"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Прекар"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Лозинка"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Одбиј"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Дозволи"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Дозволете или одбијте приÑтап до податоците за Вашата Ñметка."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Методот бара POST или DELETE."
@@ -449,17 +619,17 @@ msgstr "СтатуÑот е избришан."
msgid "No status with that ID found."
msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо тој ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ова е предолго. МакÑималната дозволена должина изнеÑува %d знаци."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Ðе е пронајдено"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -475,7 +645,7 @@ msgstr "Ðеподдржан формат."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Омилени од %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
@@ -486,7 +656,7 @@ msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
msgid "%s timeline"
msgstr "ИÑторија на %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -502,27 +672,22 @@ msgstr "%1$s / Подновувања кои Ñпоменуваат %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s подновувања коишто Ñе одговор на подновувањата од %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Јавна иÑторија на %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s подновуввања од Ñите!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Повторено од %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Повторено за %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Повторувања на %s"
@@ -532,7 +697,7 @@ msgstr "Повторувања на %s"
msgid "Notices tagged with %s"
msgstr "Забелешки означени Ñо %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Подновувањата Ñе означени Ñо %1$s на %2$s!"
@@ -594,8 +759,8 @@ msgstr "Оригинал"
msgid "Preview"
msgstr "Преглед"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Бриши"
@@ -607,29 +772,6 @@ msgstr "Подигни"
msgid "Crop"
msgstr "ОтÑечи"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се поајви проблем Ñо Вашиот ÑеÑиÑки жетон. Обидете Ñе повторно."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Ðеочекувано поднеÑување на образец."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Одберете квадратна површина од Ñликата за аватар"
@@ -669,8 +811,9 @@ msgstr ""
"претплати на Ð’Ð°Ñ Ð²Ð¾ иднина, и нема да бидете извеÑтени ако имате @-одговори "
"од кориÑникот."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Ðе"
@@ -678,13 +821,13 @@ msgstr "Ðе"
msgid "Do not block this user"
msgstr "Ðе го блокирај кориÑников"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокирај го кориÑников"
@@ -767,8 +910,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Ðе можев да ја избришам потврдата по е-пошта."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Потврди ја адреÑата"
+msgid "Confirm address"
+msgstr "Потврди адреÑа"
#: actions/confirmaddress.php:159
#, php-format
@@ -784,10 +927,51 @@ msgstr "Разговор"
msgid "Notices"
msgstr "Забелешки"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Мора да Ñте најавени за да можете да избришете програм."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Програмот не е пронајден."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Ðе Ñте ÑопÑтвеник на овој програм."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Избриши програм"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Дали Ñе Ñигурни дека Ñакате да го избришете овој програм? Ова воедно ќе ги "
+"избрише Ñите податоци за програмот од базата, вклучувајќи ги Ñите поÑтоечки "
+"поврзувања."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Ðе го бриши овој програм"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Избриши го програмов"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -818,7 +1002,7 @@ msgstr "Дали Ñте Ñигурни дека Ñакате да ја избрÐ
msgid "Do not delete this notice"
msgstr "Ðе ја бриши оваа забелешка"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Бриши ја оваа забелешка"
@@ -950,16 +1134,6 @@ msgstr "Врати оÑновно-зададени нагодувања"
msgid "Reset back to default"
msgstr "Врати по оÑновно"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Зачувај"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Зачувај изглед"
@@ -972,9 +1146,75 @@ msgstr "Оваа забелешка не Ви е омилена!"
msgid "Add to favorites"
msgstr "Додај во омилени"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Ðема таков документ."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Ðема документ Ñо наÑлов „%s“"
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Уреди програм"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Мора да Ñте најавени за да можете да уредувате програми."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Ðема таков програм."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Образецов Ñлужи за уредување на програмот."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Треба име."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Името е предолго (макÑимум 255 знаци)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Тоа име е во употреба. Одберете друго."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Треба опиÑ."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "Изворната URL-адреÑа е предолга."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Изворната URL-адреÑа е неважечка."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Треба организација."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Организацијата е предолга (макÑимумот е 255 знаци)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Треба домашна Ñтраница на организацијата."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Повикувањето е предолго."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "URL-адреÑата за повикување е неважечка."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Ðе можев да го подновам програмот."
#: actions/editgroup.php:56
#, php-format
@@ -1003,7 +1243,7 @@ msgstr "опиÑот е предолг (макÑимум %d знаци)"
msgid "Could not update group."
msgstr "Ðе можев да ја подновам групата."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Ðе можеше да Ñе Ñоздадат алијаÑи."
@@ -1044,7 +1284,8 @@ msgstr ""
"Ñандачето за Ñпам!). Во пиÑмото ќе Ñледат понатамошни напатÑтвија."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Откажи"
@@ -1127,7 +1368,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðеможам да ја нормализирам таа е-поштенÑка адреÑа"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ðеправилна адреÑа за е-пошта."
@@ -1139,7 +1380,7 @@ msgstr "Оваа е-поштенÑка адреÑа е веќе Ваша."
msgid "That email address already belongs to another user."
msgstr "Таа е-поштенÑка адреÑа е веќе зафатена од друг кориÑник."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Кодот за потврда не може да Ñе внеÑе."
@@ -1201,7 +1442,7 @@ msgstr "Оваа белешка е веќе омилена!"
msgid "Disfavor favorite"
msgstr "Тргни од омилени"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Популарни забелешки"
@@ -1349,7 +1590,7 @@ msgstr "КориÑникот е веќе блокиран од оваа груп
msgid "User is not a member of group."
msgstr "КориÑникот не членува во групата."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Блокирај кориÑник од група"
@@ -1449,23 +1690,23 @@ msgstr "Членови на групата %1$s, Ñтр. %2$d"
msgid "A list of the users in this group."
msgstr "ЛиÑта на кориÑниците на овааг група."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "ÐдминиÑтратор"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Блокирај"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Ðаправи го кориÑникот админиÑтратор на групата"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Ðаправи го/ја админиÑтратор"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Ðаправи го кориÑникот админиÑтратор"
@@ -1646,6 +1887,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Ова не е Вашиот Jabber ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Приемно Ñандаче за %1$s - Ñтр. %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1730,7 +1976,7 @@ msgstr "Лична порака"
msgid "Optionally add a personal message to the invitation."
msgstr "Можете да додадете и лична порака во поканата."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "ИÑпрати"
@@ -1830,7 +2076,7 @@ msgstr "Ðеточно кориÑничко име или лозинка"
msgid "Error setting user. You are probably not authorized."
msgstr "Грешка при поÑтавувањето на кориÑникот. Веројатно не Ñе заверени."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ðајава"
@@ -1839,17 +2085,6 @@ msgstr "Ðајава"
msgid "Login to site"
msgstr "Ðајавете Ñе"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Прекар"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Лозинка"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Запамети ме"
@@ -1857,7 +2092,8 @@ msgstr "Запамети ме"
#: actions/login.php:237 actions/register.php:480
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Следниот пат најавете Ñе автоматÑки; не за компјутери кои ги делите Ñо други!"
+"Следниот пат најавете Ñе автоматÑки; не е за компјутери кои ги делите Ñо "
+"други!"
#: actions/login.php:247
msgid "Lost or forgotten password?"
@@ -1880,21 +2116,21 @@ msgstr ""
"Ðајавете Ñе Ñо Вашето кориÑничко име и лозинка. Сè уште немате кориÑничко "
"име? [РегиÑтрирајте](%%action.register%%) нова Ñметка."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Само админиÑтратор може да направи друг кориÑник админиÑтратор."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s веќе е админиÑтратор на групата „%2$s“."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Ðе можам да добијам евиденција за членÑтво на %1$s во групата %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Ðе можам да го направам кориÑникот %1$s админиÑтратор на групата %2$s."
@@ -1903,6 +2139,26 @@ msgstr "Ðе можам да го направам кориÑникот %1$s аÐ
msgid "No current status"
msgstr "Ðема тековен ÑтатуÑ"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Ðов програм"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Мора да Ñте најавени за да можете да региÑтрирате програм."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Овој образец Ñлужи за региÑтрирање на нов програм."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Треба изворна URL-адреÑа."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Ðе можеше да Ñе Ñоздаде програмот."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ðова група"
@@ -2018,6 +2274,49 @@ msgstr "Подбуцнувањето е иÑпратено"
msgid "Nudge sent!"
msgstr "Подбуцнувањето е иÑпратено!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Мора да Ñте најавени за да можете да ги наведете програмите."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth програми"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Програми што ги имате региÑтрирано"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Сè уште немате региÑтрирано ниеден програм,"
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Поврзани програми"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Им имате дозволено приÑтап до Вашата Ñметка на Ñледните програми."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Ðе Ñте кориÑник на тој програм."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Ðе можам да му го одземам приÑтапот на програмот: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Му немате дозволено приÑтап до Вашата Ñметка на ниеден програм."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Развивачите можат да ги нагодат региÑтрациÑките поÑтавки за нивните програми "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Забелешката нема профил"
@@ -2035,8 +2334,8 @@ msgstr "тип на Ñодржини "
msgid "Only "
msgstr "Само "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -2049,7 +2348,7 @@ msgid "Notice Search"
msgstr "Пребарување на забелешки"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Други нагодувања"
#: actions/othersettings.php:71
@@ -2100,6 +2399,11 @@ msgstr "Ðазначен е неважечки најавен жетон."
msgid "Login token expired."
msgstr "Ðајавниот жетон е иÑтечен."
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Излезно Ñандаче за %1$s - Ñтр. %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2108,7 +2412,7 @@ msgstr "Излезно Ñандаче за %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
-"Ова е вашето излезно Ñандче, во кое Ñе наведени приватните пораки кои ги "
+"Ова е Вашето излезно Ñандче, во кое Ñе наведени приватните пораки кои ги "
"имате иÑпратено."
#: actions/passwordsettings.php:58
@@ -2172,7 +2476,7 @@ msgstr "Ðе можам да ја зачувам новата лозинка."
msgid "Password saved."
msgstr "Лозинката е зачувана."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Патеки"
@@ -2180,132 +2484,148 @@ msgstr "Патеки"
msgid "Path and server settings for this StatusNet site."
msgstr "Ðагодувања за патеки и Ñервери за оваа StatusNet веб-Ñтраница."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Директориумот на темата е нечитлив: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Директориумот на аватарот е недоÑтапен за пишување: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Директориумот на позадината е нечитлив: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Директориумот на локалите е нечитлив: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ðеважечки SSL-Ñервер. Дозволени Ñе најмногу 255 знаци"
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Веб-Ñтраница"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "ОпÑлужувач"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Име на домаќинот на Ñерверот на веб-Ñтраницата"
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Патека"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Патека на веб-Ñтраницата"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Патека до локалите"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Патека до директориумот на локалите"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "ИнтереÑни URL-адреÑи"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Да кориÑтам интереÑни (почитливи и повпечатливи) URL-адреÑи?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Тема"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Сервер на темата"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Патека до темата"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Директориум на темата"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Ðватари"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Сервер на аватарот"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Патека на аватарот"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Директориум на аватарот"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Позадини"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Сервер на позаднината"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Патека до позадината"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Директориум на позадината"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Ðикогаш"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Понекогаш"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Секогаш"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "КориÑти SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Кога Ñе кориÑти SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-Ñервер"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Сервер, кому ќе му Ñе иÑпраќаат SSL-барања"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Зачувај патеки"
@@ -2370,7 +2690,7 @@ msgid "Full name"
msgstr "Цело име"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Домашна Ñтраница"
@@ -2393,7 +2713,7 @@ msgstr "Биографија"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Локација"
@@ -2419,7 +2739,7 @@ msgstr ""
"Ознаки за Ð’Ð°Ñ Ñамите (букви, бројки, -, . и _), одделени Ñо запирка или "
"празно меÑто"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Јазик"
@@ -2447,7 +2767,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е преголема (највеќе до %d знаци)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Ðе е избрана чаÑовна зона."
@@ -2460,23 +2780,23 @@ msgstr "Јазикот е предлог (највеќе до 50 знаци)."
msgid "Invalid tag: \"%s\""
msgstr "Ðеважечка ознака: „%s“"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Ðе можев да го подновам кориÑникот за автопретплата."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Ðе можев да ги зачувам нагодувањата за локација"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Ðе можам да го зачувам профилот."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Ðе можев да ги зачувам ознаките."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Ðагодувањата Ñе зачувани"
@@ -2498,19 +2818,19 @@ msgstr "Јавна иÑторија, Ñтр. %d"
msgid "Public timeline"
msgstr "Јавна иÑторија"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Канал на јавниот поток (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Канал на јавниот поток (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Канал на јавниот поток (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2518,11 +2838,11 @@ msgid ""
msgstr ""
"Ова е јавната иÑторија за %%site.name%%, но доÑега никој ништо нема објавено."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Создајте ја првата забелешка!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2530,7 +2850,7 @@ msgstr ""
"Зошто не [региÑтрирате Ñметка](%%action.register%%) и Ñтанете првиот "
"објавувач!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2544,7 +2864,7 @@ msgstr ""
"Ñподелувате забелешки за Ñебе Ñо приајтелите, ÑемејÑтвото и колегите! "
"([Прочитајте повеќе](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2582,7 +2902,7 @@ msgstr ""
"Зошто не [региÑтрирате Ñметка](%%action.register%%) и Ñтанете прв што ќе "
"објави!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Облак од ознаки"
@@ -2724,7 +3044,7 @@ msgstr "Жалиме, неважечки код за поканата."
msgid "Registration successful"
msgstr "РегиÑтрацијата е уÑпешна"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑтрирај Ñе"
@@ -2768,7 +3088,7 @@ msgid "Same as password above. Required."
msgstr "ИÑто што и лозинката погоре. Задолжително поле."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-пошта"
@@ -2875,7 +3195,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL на Вашиот профил на друга компатибилна Ñлужба за микроблогирање."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Претплати Ñе"
@@ -2913,7 +3233,7 @@ msgstr "Ðе можете да повторувате ÑопÑтвена забÐ
msgid "You already repeated that notice."
msgstr "Веќе ја имате повторено таа забелешка."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Повторено"
@@ -2927,6 +3247,11 @@ msgstr "Повторено!"
msgid "Replies to %s"
msgstr "Одговори иÑпратени до %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Одговори на %1$s, Ñтр. %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2974,6 +3299,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Одговори на %1$s на %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Ðе можете да Ñтавате кориÑници во пеÑочен режим на оваа веб-Ñтраница."
@@ -2982,6 +3311,123 @@ msgstr "Ðе можете да Ñтавате кориÑници во пеÑоч
msgid "User is already sandboxed."
msgstr "КориÑникот е веќе во пеÑочен режим."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "СеÑии"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Ðагодувања на ÑеÑиите за оваа StatusNet веб-Ñтраница."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Раководење Ñо ÑеÑии"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Дали Ñамите да Ñи раководиме Ñо ÑеÑиите."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Поправка на грешки во ÑеÑија"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Вклучи извод од поправка на грешки за ÑеÑии."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Зачувај нагодувања на веб-Ñтраницата"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Мора да Ñте најавени за да можете да го видите програмот."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Профил на програмот"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Икона"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Име"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Организација"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "ОпиÑ"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "СтатиÑтики"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Создадено од %1$s - оÑновен приÑтап: %2$s - %3$d кориÑници"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "ДејÑтва на програмот"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Клуч за промена и тајна"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Инфо за програмот"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Потрошувачки клуч"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Потрошувачка тајна"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL на жетонот на барањето"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL на приÑтапниот жетон"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Одобри URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Ðапомена: Поддржуваме HMAC-SHA1 потпиÑи. Ðе поддржуваме потпишување Ñо проÑÑ‚ "
+"текÑÑ‚."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+"Дали Ñте Ñигурни дека Ñакате да го Ñмените вашиот кориÑнички клуч и тајната "
+"фраза?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Омилени забелешки на %1$s, Ñтр. %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Ðе можев да ги вратам омилените забелешки."
@@ -3039,17 +3485,22 @@ msgstr "Ова е начин да го Ñподелите она што Ви ÑÐ
msgid "%s group"
msgstr "Група %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Група %1$s, Ñтр. %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Профил на група"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Забелешка"
@@ -3095,10 +3546,6 @@ msgstr "(Ðема)"
msgid "All members"
msgstr "Сите членови"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "СтатиÑтики"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Создадено"
@@ -3163,6 +3610,11 @@ msgstr "Избришана забелешка"
msgid " tagged %s"
msgstr " означено Ñо %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, Ñтр. %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3188,12 +3640,12 @@ msgstr "Канал Ñо забелешки за %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF за %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "Ова е иÑторијата за %1$s, но %2$s Ñè уште нема објавено ништо."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3201,7 +3653,7 @@ msgstr ""
"Имате видено нешто интереÑно во поÑледно време? Сè уште немате објавено "
"ниедна забелешка, но Ñега е добро време за да почнете :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3210,7 +3662,7 @@ msgstr ""
"Можете да го подбуцнете кориÑникот %1$s или [да објавите нешто што Ñакате да "
"го прочита](%%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3224,7 +3676,7 @@ msgstr ""
"register%%%%) за да можете да ги Ñледите забелешките на **%s** и многу "
"повеќе! ([Прочитајте повеќе](%%%%doc.help%%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3235,7 +3687,7 @@ msgstr ""
"(http://mk.wikipedia.org/wiki/Микроблогирање) базирана на Ñлободната "
"програмÑка алатка [StatusNet](http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Повторувања на %s"
@@ -3252,203 +3704,149 @@ msgstr "КориÑникот е веќе замолчен."
msgid "Basic settings for this StatusNet site."
msgstr "ОÑновни нагодувања за оваа StatusNet веб-Ñтраница."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Должината на името на веб-Ñтраницата не може да изнеÑува нула."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Мора да имате важечка контактна е-поштенÑка адреÑа."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "Ðепознат јазик „%s“"
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "Ðеважечки URL за извештај од Ñнимката."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Ðеважечка вредноÑÑ‚ на пуштањето на Ñнимката."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "ЧеÑтотата на Ñнимките мора да биде бројка."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Минималното ограничување на текÑтот изнеÑува 140 знаци."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "Ограничувањето на дуплирањето мора да изнеÑува барем 1 Ñекунда."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Општи"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Име на веб-Ñтраницата"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Името на Вашата веб-Ñтраница, како на пр. „Микроблог на Вашафирма“"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Овозможено од"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
"ТекÑÑ‚ за врÑката за наведување на авторите во долната колонцифра на Ñекоја "
"Ñтраница"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URL-адреÑа на овозможувачот на уÑлугите"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
"URL-адреÑата која е кориÑти за врÑки за автори во долната колоцифра на "
"Ñекоја Ñтраница"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Контактна е-пошта за Вашата веб-Ñтраница"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Локално"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "ОÑновна чаÑовна зона"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Матична чаÑовна зона за веб-Ñтраницата; обично UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "ОÑновен јазик"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL-адреÑи"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "ОпÑлужувач"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Име на домаќинот на Ñерверот на веб-Ñтраницата"
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "ИнтереÑни URL-адреÑи"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Да кориÑтам интереÑни (почитливи и повпечатливи) URL-адреÑи?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "ПриÑтап"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Приватен"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-"Да им забранам на анонимните (ненајавени) кориÑници да ја гледаат веб-"
-"Ñтраницата?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Само Ñо покана"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "РегиÑтрирање Ñамо Ñо покана."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Затворен"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Оневозможи нови региÑтрации."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Снимки"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "По ÑлучајноÑÑ‚ во текот на поÑета"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Во зададена задача"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Снимки од податоци"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Кога да им Ñе иÑпраќаат ÑтатиÑтички податоци на status.net Ñерверите"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "ЧеÑтота"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Ќе Ñе иÑпраќаат Ñнимки на Ñекои N поÑети"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL на извештајот"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Снимките ќе Ñе иÑпраќаат на оваа URL-адреÑа"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Ограничувања"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Ограничување на текÑтот"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "МакÑимален број на знаци за забелешки."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Ограничување на дуплирањето"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Колку долго треба да почекаат кориÑниците (во Ñекунди) за да можат повторно "
"да го објават иÑтото."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Зачувај нагодувања на веб-Ñтраницата"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "Ðагодувања за СМС"
@@ -3501,11 +3899,11 @@ msgstr "Ðема телефонÑки број."
#: actions/smssettings.php:311
msgid "No carrier selected."
-msgstr "Ðема избрано оператор."
+msgstr "Ðемате избрано оператор."
#: actions/smssettings.php:318
msgid "That is already your phone number."
-msgstr "Ова и Ñега е вашиот телефонÑки број."
+msgstr "Ова и Ñега е Вашиот телефонÑки број."
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
@@ -3525,7 +3923,7 @@ msgstr "Ова е погрешен потврден број."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr "Тоа не е вашиот телефонÑки број."
+msgstr "Тоа не е Вашиот телефонÑки број."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -3552,15 +3950,26 @@ msgstr "Ðема внеÑено код"
msgid "You are not subscribed to that profile."
msgstr "Ðе Ñте претплатени на тој профил."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Ðе можев да ја зачувам претплатата."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ðе е локален кориÑник."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ðема таква податотека."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Ðе Ñте претплатени на тој профил."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Претплатено"
@@ -3624,7 +4033,7 @@ msgstr "Ова Ñе луѓето чии забелешки ги Ñледите."
msgid "These are the people whose notices %s listens to."
msgstr "Ова Ñе луѓето чии забелешки ги Ñледи %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3639,19 +4048,24 @@ msgstr ""
"(%%action.featured%%). Ðко Ñте [кориÑник на Twitter](%%action.twittersettings"
"%%), тука можете автоматÑки да Ñе претплатите на луѓе кои таму ги Ñледите."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не Ñледи никого."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Забелешки означени Ñо %1$s, Ñтр. %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3680,7 +4094,8 @@ msgstr "Означи %s"
msgid "User profile"
msgstr "КориÑнички профил"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Фото"
@@ -3739,7 +4154,7 @@ msgstr "Во барањето нема id на профилот."
msgid "Unsubscribed"
msgstr "Претплатата е откажана"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3756,84 +4171,64 @@ msgstr "КориÑник"
msgid "User settings for this StatusNet site."
msgstr "КориÑнички нагодувања за оваа StatusNet веб-Ñтраница."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Ðеважечко ограничување за биографијата. Мора да е бројчено."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "ÐЕважечки текÑÑ‚ за добредојде. Дозволени Ñе највеќе 255 знаци."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ðеважечки Ð¾Ð¿Ð¸Ñ Ð¿Ð¾ оÑновно: „%1$s“ не е кориÑник."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профил"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Ограничување за биографијата"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "МакÑимална големина на профилната биографија во знаци."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Ðови кориÑници"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Добредојде за нов кориÑник"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "ТекÑÑ‚ за добредојде на нови кориÑници (највеќе до 255 знаци)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "ОÑновно-зададена претплата"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "ÐвтоматÑки претплатувај нови кориÑници на овој кориÑник."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Покани"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Поканите Ñе овозможени"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Дали да им е дозволено на кориÑниците да канат други кориÑници."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "СеÑии"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Раководење Ñо ÑеÑии"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Дали Ñамите да Ñи раководиме Ñо ÑеÑиите."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Поправка на грешки во ÑеÑија"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Вклучи извод од поправка на грешки за ÑеÑии."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Одобрете ја претплатата"
@@ -3848,36 +4243,36 @@ msgstr ""
"за забелешките на овој кориÑник. Ðко не Ñакате да Ñе претплатите, едноÑтавно "
"кликнете на „Одбиј“"
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Лиценца"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Прифати"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Претплати Ñе на кориÑников"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Одбиј"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Одбиј ја оваа претплата"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Ðема барање за проверка!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Претплатата е одобрена"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3887,11 +4282,11 @@ msgstr ""
"инÑтрукциите на веб-Ñтраницата за да дознаете како Ñе одобрува претплата. "
"Жетонот на Вашата претплата е:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Претплатата е одбиена"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3901,37 +4296,37 @@ msgstr ""
"инÑтрукциите на веб-Ñтраницата за да дознаете како Ñе одбива претплата во "
"потполноÑÑ‚."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "URI-то на Ñледачот „%s“ не е пронајдено тука."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "Следениот URI „%s“ е предолг."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "Следеното URI „%s“ е за локален кориÑник."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "Профилната URL-адреÑа „%s“ е за локален кориÑник."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "URL-адреÑата „%s“ за аватар е неважечка."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Ðе можам да ја прочитам URL на аватарот „%s“."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Погрешен тип на Ñлика за URL на аватарот „%s“."
@@ -3952,6 +4347,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Добар апетит!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Групи %1$s, Ñтр. %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Пребарај уште групи"
@@ -3982,10 +4382,6 @@ msgstr ""
"Оваа веб-Ñтраница работи на %1$s верзија %2$s, ÐвторÑки права 2008-2010 "
"StatusNet, Inc. и учеÑници."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "УчеÑници"
@@ -4027,11 +4423,7 @@ msgstr ""
msgid "Plugins"
msgstr "Приклучоци"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Име"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Верзија"
@@ -4039,10 +4431,6 @@ msgstr "Верзија"
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑ"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4064,19 +4452,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "ВОлку голема податотека ќе ја надмине Вашата меÑечна квота од %d бајти"
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Профил на група"
+msgstr "Зачленувањето во групата не уÑпеа."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Ðе можев да ја подновам групата."
+msgstr "Ðе е дел од групата."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Профил на група"
+msgstr "Ðапуштањето на групата не уÑпеа."
#: classes/Login_token.php:76
#, php-format
@@ -4095,27 +4480,27 @@ msgstr "Ðе можев да ја иÑпратам пораката."
msgid "Could not update message with new URI."
msgstr "Ðе можев да ја подновам пораката Ñо нов URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Проблем Ñо зачувувањето на белешката. Премногу долго."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Проблем Ñо зачувувањето на белешката. Ðепознат кориÑник."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Премногу забелњшки за прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4123,34 +4508,58 @@ msgstr ""
"Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Забрането Ви е да објавувате забелешки на оваа веб-Ñтраница."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Одговор од внеÑот во базата: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Проблем при зачувувањето на групното приемно Ñандаче."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Блокирани Ñте од претплаќање."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Веќе претплатено!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "КориÑникот Ве има блокирано."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ðе Ñте претплатени!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Ðе можам да ја избришам Ñамопретплатата."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Претплата не може да Ñе избрише."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добредојдовте на %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Ðе можев да ја Ñоздадам групата."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Ðе можев да назначам членÑтво во групата."
@@ -4191,128 +4600,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Страница без наÑлов"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Главна навигација"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Дома"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Личен профил и иÑторија на пријатели"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Сметка"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Промена на е-пошта, аватар, лозинка, профил"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Поврзи Ñе"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Поврзи Ñе Ñо уÑлуги"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Промена на конфигурацијата на веб-Ñтраницата"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете пријатели и колеги да Ви Ñе придружат на %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Одјави Ñе"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Одјава"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Создај Ñметка"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ðајава"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Помош"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ðапомош!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Барај"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Пребарајте луѓе или текÑÑ‚"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Ðапомена за веб-Ñтраницата"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Локални прегледи"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Ðапомена за Ñтраницата"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Споредна навигација"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "За"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "ЧПП"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "УÑлови"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "ПриватноÑÑ‚"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Изворен код"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Значка"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Лиценца на програмот StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4321,12 +4726,12 @@ msgstr ""
"**%%site.name%%** е ÑÐµÑ€Ð²Ð¸Ñ Ð·Ð° микроблогирање што ви го овозможува [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е ÑÐµÑ€Ð²Ð¸Ñ Ð·Ð° микроблогирање."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4337,33 +4742,59 @@ msgstr ""
"верзија %s, доÑтапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Лиценца на Ñодржините на веб-Ñтраницата"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Содржината и податоците на %1$s Ñе лични и доверливи."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"ÐвторÑките права на Ñодржината и податоците Ñе во ÑопÑтвеноÑÑ‚ на %1$s. Сите "
+"права задржани."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"ÐвторÑките права на Ñодржината и податоците им припаѓаат на учеÑниците. Сите "
+"права задржани."
+
+#: lib/action.php:827
msgid "All "
msgstr "Сите "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "лиценца."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Прелом на Ñтраници"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "По"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Пред"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4393,10 +4824,99 @@ msgstr "ОÑновни нагодувања на веб-Ñтраницата"
msgid "Design configuration"
msgstr "Конфигурација на изгледот"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Конфигурација на кориÑник"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Конфигурација на приÑтапот"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Конфигурација на патеки"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Конфигурација на ÑеÑиите"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"API-реÑурÑот бара да може и да чита и да запишува, а вие можете Ñамо да "
+"читате."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr "ÐеуÑпешен обид за API-заверка, прекар = %1$s, прокÑи = %2$s, IP = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Уреди програм"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Икона за овој програм"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Опишете го програмот Ñо %d знаци"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Опишете го Вашиот програм"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "Изворна URL-адреÑа"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL на Ñтраницата на програмот"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Организацијата одговорна за овој програм"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL на Ñтраницата на организацијата"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL за пренаÑочување по заверката"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "ПрелиÑтувач"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Работна површина"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Тип на програм, прелиÑтувач или работна површина"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Само читање"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Читање-пишување"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"ОÑновно-зададен приÑтап за овој програм: Ñамо читање, или читање-пишување"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Одземи"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Прилози"
@@ -4417,11 +4937,11 @@ msgstr "Забелешки кадешто Ñе јавува овој прилоÐ
msgid "Tags for this attachment"
msgstr "Ознаки за овој прилог"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Менувањето на лозинката не уÑпеа"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Менувањето на лозинка не е дозволено"
@@ -4575,80 +5095,90 @@ msgstr "Грешка при зачувувањето на белешката."
msgid "Specify the name of the user to subscribe to"
msgstr "Ðазначете го името на кориÑникот на којшто Ñакате да Ñе претплатите"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Ðема таков кориÑник"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Претплатено на %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Ðазначете го името на кориÑникот од кого откажувате претплата."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Претплатата на %s е откажана"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Ðаредбата Ñè уште не е имплементирана."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "ИзвеÑтувањето е иÑклучено."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Ðе можам да иÑклучам извеÑтување."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "ИзвеÑтувањето е вклучено."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Ðе можам да вклучам извеÑтување."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Ðаредбата за најава е оневозможена"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Оваа врÑка може да Ñе употреби Ñамо еднаш, и трае Ñамо 2 минути: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Претплатата на %s е откажана"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Ðе Ñте претплатени никому."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ðе ни го иÑпративте тој профил."
msgstr[1] "Ðе ни го иÑпративте тој профил."
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Ðикој не е претплатен на ВаÑ."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
msgstr[1] "Оддалечена претплата"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Ðе членувате во ниедна група."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ðе ни го иÑпративте тој профил."
msgstr[1] "Ðе ни го иÑпративте тој профил."
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4662,6 +5192,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4726,19 +5257,19 @@ msgstr ""
"tracks - Ñè уште не е имплементирано.\n"
"tracking - Ñè уште не е имплементирано.\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ðема пронајдено конфигурациÑка податотека. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Побарав конфигурациони податотеки на Ñледниве меÑта: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Препорачуваме да го пуштите инÑталатерот за да го поправите ова."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Оди на инÑталаторот."
@@ -4754,6 +5285,14 @@ msgstr "Подновувања преку инÑтант-пораки (IM)"
msgid "Updates by SMS"
msgstr "Подновувања по СМС"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Сврзувања"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "ОвлаÑтени поврзани програми"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Грешка во базата на податоци"
@@ -4766,8 +5305,8 @@ msgstr "Подигни податотека"
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
-"Ðе можете да подигнете личната позадинÑка Ñлика. МакÑималната дозволена "
-"големина изнеÑува 2МБ."
+"Можете да подигнете лична позадинÑка Ñлика. МакÑималната дозволена големина "
+"изнеÑува 2МБ."
#: lib/designsettings.php:418
msgid "Design defaults restored."
@@ -4940,15 +5479,15 @@ msgstr "МБ"
msgid "kB"
msgstr "кб"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Ðепознат јазик „%s“"
+msgstr "Ðепознат извор на приемна пошта %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5228,7 +5767,7 @@ msgstr ""
"впуштите во разговор Ñо други кориÑници. Луѓето можат да ви иÑпраќаат пораки "
"што ќе можете да ги видите Ñамо Вие."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "од"
@@ -5349,57 +5888,55 @@ msgid "Do not share my location"
msgstr "Ðе ја прикажувај мојата локација"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Сокриј го ова инфо"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Жалиме, но добивањето на Вашата меÑтоположба трае подолго од очекуваното. "
+"Обидете Ñе подоцна."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "С"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Ј"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "И"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "З"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "во"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "во контекÑÑ‚"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Повторено од"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Одговори на забелешкава"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Одговор"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Забелешката е повторена"
@@ -5431,11 +5968,7 @@ msgstr "Грешка во внеÑувањето на оддалечениот Ð
msgid "Duplicate notice"
msgstr "Дуплирај забелешка"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Блокирани Ñте од претплаќање."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Ðе може да Ñе внеÑе нова претплата."
@@ -5451,19 +5984,19 @@ msgstr "Одговори"
msgid "Favorites"
msgstr "Омилени"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Примени"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Ваши приемни пораки"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "За праќање"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Ваши иÑпратени пораки"
@@ -5540,6 +6073,10 @@ msgstr "Да ја повторам белешкава?"
msgid "Repeat this notice"
msgstr "Повтори ја забелешкава"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Ðе е зададен кориÑник за еднокориÑничкиот режим."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "ПеÑок"
@@ -5607,35 +6144,6 @@ msgstr "Луѓе претплатени на %s"
msgid "Groups %s is a member of"
msgstr "Групи кадешто членува %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Веќе претплатено!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "КориÑникот Ве има блокирано."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Претплатата е неуÑпешна."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Ðе можев да прептлатам друг кориÑник на ВаÑ."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ðе Ñте претплатени!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Ðе можам да ја избришам Ñамопретплатата."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Претплата не може да Ñе избрише."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5686,67 +6194,67 @@ msgstr "Уреди аватар"
msgid "User actions"
msgstr "КориÑнички дејÑтва"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Уреди нагодувања на профилот"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Уреди"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "ИÑпрати му директна порака на кориÑников"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Порака"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Модерирај"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "пред неколку Ñекунди"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "пред еден чаÑ"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "пред %d чаÑа"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "пред еден меÑец"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "пред %d меÑеца"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "пред една година"
@@ -5760,7 +6268,7 @@ msgstr "%s не е важечка боја!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s не е важечка боја! КориÑтете 3 или 6 шеÑнаеÑетни (hex) знаци."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 5fe48460e..cf3daf093 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -8,17 +8,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:46+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:22+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Tilgang"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Innstillinger for nettstedstilgang"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registrering"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privat"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Forhindre anonyme brukere (ikke innlogget) å se nettsted?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Kun invitasjon"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Gjør at registrering kun kan skje gjennom invitasjon."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Lukket"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Deaktiver nye registreringer."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lagre"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Lagre tilgangsinnstillinger"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -33,25 +85,29 @@ msgstr "Ingen slik side"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ingen slik bruker"
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s og venner, side %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -88,16 +144,16 @@ msgstr ""
"eller post noe selv."
#: actions/all.php:134
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få "
-"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%"
-"s)."
+"Du kan prøve å [knuffe %1$s](../%2$s) fra dennes profil eller [poste noe for "
+"å få hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?"
+"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -110,8 +166,8 @@ msgstr ""
msgid "You and friends"
msgstr "Du og venner"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringer fra %1$s og venner på %2$s!"
@@ -121,23 +177,23 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metode ikke funnet!"
@@ -152,7 +208,7 @@ msgstr "API-metode ikke funnet!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Denne metoden krever en POST."
@@ -183,8 +239,9 @@ msgstr "Klarte ikke å lagre profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -265,18 +322,16 @@ msgid "No status found with that ID."
msgstr "Fant ingen status med den ID-en."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "Denne statusen er allerede en favoritt!"
+msgstr "Denne statusen er allerede en favoritt."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "Kunne ikke opprette favoritt."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "Den statusen er ikke en favoritt!"
+msgstr "Den statusen er ikke en favoritt."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -296,23 +351,20 @@ msgid "Could not unfollow user: User not found."
msgstr "Kunne ikke slutte å følge brukeren: Fant ikke brukeren."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "Du kan ikke slutte å følge deg selv!"
+msgstr "Du kan ikke slutte å følge deg selv."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "To bruker ID-er eller kallenavn må oppgis."
-#: actions/apifriendshipsshow.php:135
-#, fuzzy
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke bestemme kildebruker."
-#: actions/apifriendshipsshow.php:143
-#, fuzzy
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke finne målbruker."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -332,7 +384,8 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
msgid "Not a valid nickname."
msgstr "Ugyldig nick."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -344,7 +397,8 @@ msgstr "Hjemmesiden er ikke en gyldig URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Beklager, navnet er for langt (max 250 tegn)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Beskrivelsen er for lang (maks %d tegn)."
@@ -359,31 +413,30 @@ msgstr ""
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "For mange alias! Maksimum %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Ugyldig hjemmeside '%s'"
+msgstr "Ugyldig alias: «%s»"
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Det nicket er allerede i bruk. Prøv et annet."
+msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "Alias kan ikke være det samme som kallenavn."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
-msgstr "API-metode ikke funnet!"
+msgstr "Gruppe ikke funnet!"
#: actions/apigroupjoin.php:110 actions/joingroup.php:90
msgid "You are already a member of that group."
@@ -391,22 +444,21 @@ msgstr "Du er allerede medlem av den gruppen."
#: 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 "Du har blitt blokkert fra den gruppen av administratoren."
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
-msgstr "Du er allerede logget inn!"
+msgstr "Du er ikke et medlem av denne gruppen."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -416,72 +468,175 @@ msgstr "%s sine grupper"
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
-msgstr ""
+msgstr "%s grupper"
#: actions/apigrouplistall.php:94
#, php-format
msgid "groups on %s"
+msgstr "grupper på %s"
+
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Ingen verdi for oauth_token er oppgitt."
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Ugyldig størrelse"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Ugyldig kallenavn / passord!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Tillat eller nekt tilgang"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
msgstr ""
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nick"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Passord"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Nekt"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Tillat"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Tillat eller nekt tilgang til din kontoinformasjon."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
#: actions/apistatusesdestroy.php:130
msgid "You may not delete another user's status."
-msgstr ""
+msgstr "Du kan ikke slette statusen til en annen bruker."
#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
-msgstr ""
+msgstr "Ingen slik notis."
#: actions/apistatusesretweet.php:83
-#, fuzzy
msgid "Cannot repeat your own notice."
-msgstr "Kan ikke slette notisen."
+msgstr "Kan ikke gjenta din egen notis."
#: actions/apistatusesretweet.php:91
-#, fuzzy
msgid "Already repeated that notice."
-msgstr "Kan ikke slette notisen."
+msgstr "Allerede gjentatt den notisen."
#: actions/apistatusesshow.php:138
msgid "Status deleted."
-msgstr ""
+msgstr "Status slettet."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr ""
+msgstr "Ingen status med den ID-en funnet."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
-msgstr ""
+msgstr "Ikke funnet"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
-msgstr ""
+msgstr "Formatet støttes ikke."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s / Oppdateringer som svarer til %2$s"
+msgstr "%1$s / Favoritter fra %2$s"
-#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:117
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
+msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -489,65 +644,59 @@ msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
msgid "%s timeline"
msgstr "%s tidslinje"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Oppdateringar fra %1$s på %2$s!"
#: actions/apitimelinementions.php:117
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Oppdateringer som svarer til %2$s"
+msgstr "%1$s / Oppdateringer som nevner %2$s"
#: actions/apitimelinementions.php:127
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentlig tidslinje"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringer fra alle sammen!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
+#, php-format
msgid "Repeated to %s"
-msgstr "Svar til %s"
+msgstr "Gjentatt til %s"
-#: actions/apitimelineretweetsofme.php:112
-#, fuzzy, php-format
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
msgid "Repeats of %s"
-msgstr "Svar til %s"
+msgstr "Repetisjoner av %s"
#: actions/apitimelinetag.php:102 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
-msgstr ""
+msgstr "Notiser merket med %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
-#, fuzzy, php-format
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Mikroblogg av %s"
+msgstr "Oppdateringer merket med %1$s på %2$s!"
#: actions/apiusershow.php:96
-#, fuzzy
msgid "Not found."
-msgstr "Ingen id."
+msgstr "Ikke funnet."
#: actions/attachment.php:73
msgid "No such attachment."
-msgstr ""
+msgstr "Ingen slike vedlegg."
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -555,11 +704,11 @@ msgstr ""
#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
#: actions/showgroup.php:121
msgid "No nickname."
-msgstr ""
+msgstr "Ingen kallenavn."
#: actions/avatarbynickname.php:64
msgid "No size."
-msgstr ""
+msgstr "Ingen størrelse."
#: actions/avatarbynickname.php:69
msgid "Invalid size."
@@ -583,25 +732,23 @@ msgstr ""
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:251
-#, fuzzy
msgid "Avatar settings"
-msgstr "Innstillinger for IM"
+msgstr "Avatarinnstillinger"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
#: actions/grouplogo.php:199 actions/grouplogo.php:259
msgid "Original"
-msgstr ""
+msgstr "Original"
#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
#: actions/grouplogo.php:210 actions/grouplogo.php:271
msgid "Preview"
-msgstr ""
+msgstr "Forhåndsvis"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
-#, fuzzy
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
-msgstr "slett"
+msgstr "Slett"
#: actions/avatarsettings.php:166 actions/grouplogo.php:233
msgid "Upload"
@@ -609,30 +756,7 @@ msgstr "Last opp"
#: actions/avatarsettings.php:231 actions/grouplogo.php:286
msgid "Crop"
-msgstr ""
-
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
+msgstr "Beskjær"
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
@@ -648,21 +772,19 @@ msgstr "Brukerbildet har blitt oppdatert."
#: actions/avatarsettings.php:369
msgid "Failed updating avatar."
-msgstr ""
+msgstr "Oppdatering av avatar mislyktes."
#: actions/avatarsettings.php:393
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Brukerbildet har blitt oppdatert."
+msgstr "Avatar slettet."
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
-msgstr "Du er allerede logget inn!"
+msgstr "Du har allerede blokkert den brukeren."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
-msgstr ""
+msgstr "Blokker brukeren"
#: actions/block.php:130
msgid ""
@@ -671,25 +793,25 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
-msgstr ""
+msgstr "Nei"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
msgid "Do not block this user"
-msgstr "Kan ikke slette notisen."
+msgstr "Ikke blokker denne brukeren"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
-msgstr ""
+msgstr "Blokker denne brukeren"
#: actions/block.php:167
msgid "Failed to save block information."
@@ -702,19 +824,18 @@ msgstr ""
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
-#, fuzzy
msgid "No such group."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Ingen slik gruppe."
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "Klarte ikke å lagre profil."
+msgstr "%s blokkerte profiler"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s og venner"
+msgstr "%1$s blokkerte profiler, side %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -734,11 +855,11 @@ msgstr ""
#: actions/bookmarklet.php:50
msgid "Post to "
-msgstr ""
+msgstr "Post til "
#: actions/confirmaddress.php:75
msgid "No confirmation code."
-msgstr ""
+msgstr "Ingen bekreftelseskode."
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
@@ -755,7 +876,7 @@ msgstr ""
#: actions/confirmaddress.php:94
msgid "That address has already been confirmed."
-msgstr ""
+msgstr "Den adressen har allerede blitt bekreftet."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
@@ -768,31 +889,71 @@ msgstr "Klarte ikke å oppdatere bruker."
#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
-msgstr ""
+msgstr "Kunne ikke slette e-postbekreftelse."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Bekreft adresse"
#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
+msgstr "Adressen «%s» har blitt bekreftet for din konto."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Bekreftelseskode"
+msgstr "Samtale"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Du må være innlogget for å slette et program."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Program ikke funnet."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Du er ikke eieren av dette programmet."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Slett program"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Er du sikker på at du vil slette dette programmet? Dette vil slette alle "
+"data om programmet fra databasen, inkludert alle eksisterende "
+"brukertilkoblinger."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Ikke slett dette programmet"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Slett dette programmet"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -808,49 +969,48 @@ msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
+"Du er i ferd med å slette en notis permanent. Når dette er gjort kan det "
+"ikke gjøres om."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
-msgstr ""
+msgstr "Slett notis"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
msgstr "Er du sikker på at du vil slette denne notisen?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Kan ikke slette notisen."
+msgstr "Ikke slett denne notisen"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
-msgstr ""
+msgstr "Slett denne notisen"
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Du kan ikke slette brukere."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "Ugyldig OpenID"
+msgstr "Du kan bare slette lokale brukere."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "slett"
+msgstr "Slett bruker"
#: actions/deleteuser.php:135
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
+"Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data "
+"om brukeren fra databasen, uten sikkerhetskopi."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Kan ikke slette notisen."
+msgstr "Slett denne brukeren"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:316 lib/groupnav.php:119
@@ -862,9 +1022,8 @@ msgid "Design settings for this StatusNet site."
msgstr ""
#: actions/designadminpanel.php:275
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "Ugyldig størrelse"
+msgstr "Ugyldig logo-URL."
#: actions/designadminpanel.php:279
#, php-format
@@ -872,13 +1031,12 @@ msgid "Theme not available: %s"
msgstr ""
#: actions/designadminpanel.php:375
-#, fuzzy
msgid "Change logo"
-msgstr "Endre passordet ditt"
+msgstr "Endre logo"
#: actions/designadminpanel.php:380
msgid "Site logo"
-msgstr ""
+msgstr "Nettstedslogo"
#: actions/designadminpanel.php:387
#, fuzzy
@@ -896,12 +1054,12 @@ msgstr ""
#: actions/designadminpanel.php:417 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Endre bakgrunnsbilde"
#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Bakgrunn"
#: actions/designadminpanel.php:427
#, php-format
@@ -931,9 +1089,8 @@ msgid "Change colours"
msgstr "Endre farger"
#: actions/designadminpanel.php:510 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "Koble til"
+msgstr "Innhold"
#: actions/designadminpanel.php:523 lib/designsettings.php:204
#, fuzzy
@@ -950,7 +1107,7 @@ msgstr "Lenker"
#: actions/designadminpanel.php:577 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Bruk standard"
#: actions/designadminpanel.php:578 lib/designsettings.php:248
msgid "Restore default designs"
@@ -960,32 +1117,89 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Lagre"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Denne notisen er ikke en favoritt!"
#: actions/disfavor.php:94
msgid "Add to favorites"
+msgstr "Legg til i favoritter"
+
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Inget slikt dokument «%s»"
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Rediger program"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Du må være innlogget for å redigere et program."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Inget slikt program."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Bruk dette skjemaet for å redigere programmet ditt."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Navn kreves."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Navn er for langt (maks 250 tegn)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Navn allerede i bruk. Prøv et annet."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Beskrivelse kreves."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "Kilde-URL er for lang."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Kilde-URL er ikke gyldig."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organisasjon kreves."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organisasjon er for lang (maks 255 tegn)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
msgstr ""
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
msgstr ""
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Klarte ikke å oppdatere bruker."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -993,7 +1207,7 @@ msgstr ""
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Du må være innlogget for å opprette en gruppe."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
@@ -1006,28 +1220,25 @@ msgid "Use this form to edit the group."
msgstr ""
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
+msgstr "beskrivelse er for lang (maks %d tegn)"
#: actions/editgroup.php:253
-#, fuzzy
msgid "Could not update group."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke oppdatere gruppe."
-#: actions/editgroup.php:259 classes/User_group.php:390
-#, fuzzy
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke opprette alias."
#: actions/editgroup.php:269
msgid "Options saved."
msgstr ""
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
-msgstr "Innstillinger for e-post"
+msgstr "E-postinnstillinger"
#: actions/emailsettings.php:71
#, php-format
@@ -1058,18 +1269,18 @@ msgstr ""
"melding med videre veiledning."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Avbryt"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
msgstr "E-postadresse"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "E-postadresse («brukernavn@eksempel.org»)"
#: actions/emailsettings.php:126 actions/imsettings.php:133
#: actions/smssettings.php:145
@@ -1139,7 +1350,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
@@ -1151,7 +1362,7 @@ msgstr "Det er allerede din e-postadresse."
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr ""
@@ -1185,7 +1396,7 @@ msgstr "Det er ikke din e-postadresse."
#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
-msgstr ""
+msgstr "Adressen ble fjernet."
#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
@@ -1212,15 +1423,15 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
-msgstr ""
+msgstr "Populære notiser"
#: actions/favorited.php:67
#, php-format
msgid "Popular notices, page %d"
-msgstr ""
+msgstr "Populære notiser, side %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
@@ -1321,14 +1532,12 @@ msgid "Error updating remote profile"
msgstr ""
#: actions/getfile.php:79
-#, fuzzy
msgid "No such file."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Ingen slik fil."
#: actions/getfile.php:83
-#, fuzzy
msgid "Cannot read file."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Kan ikke lese fil."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1360,7 +1569,7 @@ msgstr "Du er allerede logget inn!"
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr ""
@@ -1385,9 +1594,8 @@ msgid "Database error blocking user from group."
msgstr ""
#: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
msgid "No ID."
-msgstr "Ingen id."
+msgstr "Ingen ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
@@ -1415,7 +1623,7 @@ msgstr ""
#: actions/grouplogo.php:139 actions/grouplogo.php:192
msgid "Group logo"
-msgstr ""
+msgstr "Gruppelogo"
#: actions/grouplogo.php:150
#, php-format
@@ -1433,9 +1641,8 @@ msgid "Pick a square area of the image to be the logo."
msgstr ""
#: actions/grouplogo.php:396
-#, fuzzy
msgid "Logo updated."
-msgstr "Avataren har blitt oppdatert."
+msgstr "Logo oppdatert."
#: actions/grouplogo.php:398
msgid "Failed updating logo."
@@ -1444,7 +1651,7 @@ msgstr ""
#: actions/groupmembers.php:93 lib/groupnav.php:92
#, php-format
msgid "%s group members"
-msgstr ""
+msgstr "%s gruppemedlemmer"
#: actions/groupmembers.php:96
#, php-format
@@ -1455,23 +1662,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "En liste over brukerne i denne gruppen."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blokkér"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Gjør brukeren til en administrator for gruppen"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Gjør til administrator"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Gjør denne brukeren til administrator"
@@ -1501,9 +1708,8 @@ msgid ""
msgstr ""
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
msgid "Create a new group"
-msgstr "Opprett en ny konto"
+msgstr "Opprett en ny gruppe"
#: actions/groupsearch.php:52
#, php-format
@@ -1513,14 +1719,13 @@ msgid ""
msgstr ""
#: actions/groupsearch.php:58
-#, fuzzy
msgid "Group search"
-msgstr "Tekst-søk"
+msgstr "Gruppesøk"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
msgid "No results."
-msgstr ""
+msgstr "Ingen resultat."
#: actions/groupsearch.php:82
#, php-format
@@ -1638,10 +1843,15 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Det er ikke din Jabber ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Innboks for %1$s - side %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
-msgstr ""
+msgstr "Innboks for %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
@@ -1649,7 +1859,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Invitasjoner har blitt deaktivert."
#: actions/invite.php:41
#, php-format
@@ -1659,15 +1869,15 @@ msgstr ""
#: actions/invite.php:72
#, php-format
msgid "Invalid email address: %s"
-msgstr ""
+msgstr "Ugyldig e-postadresse: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Invitasjon(er) sendt"
#: actions/invite.php:112
msgid "Invite new users"
-msgstr ""
+msgstr "Inviter nye brukere"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
@@ -1676,7 +1886,7 @@ msgstr ""
#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
#, php-format
msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
#: actions/invite.php:136
msgid ""
@@ -1700,7 +1910,7 @@ msgstr ""
#: actions/invite.php:187
msgid "Email addresses"
-msgstr ""
+msgstr "E-postadresser"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
@@ -1708,13 +1918,13 @@ msgstr "Adresser til venner som skal inviteres (én per linje)"
#: actions/invite.php:192
msgid "Personal message"
-msgstr ""
+msgstr "Personlig melding"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Send"
@@ -1777,7 +1987,7 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "Du må være innlogget for å bli med i en gruppe."
#: actions/joingroup.php:131
#, php-format
@@ -1793,9 +2003,9 @@ msgid "You are not a member of that group."
msgstr ""
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%1$s sin status på %2$s"
+msgstr "%1$s forlot gruppe %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1810,7 +2020,7 @@ msgstr "Feil brukernavn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikke autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -1819,17 +2029,6 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Nick"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Passord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Husk meg"
@@ -1856,29 +2055,51 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "Du er allerede logget inn!"
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Klarte ikke å oppdatere bruker."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Gjør brukeren til en administrator for gruppen"
#: actions/microsummary.php:69
msgid "No current status"
+msgstr "Ingen nåværende status"
+
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Ingen slik side"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
msgstr ""
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -1977,10 +2198,53 @@ msgstr ""
#: actions/nudge.php:94
msgid "Nudge sent"
-msgstr ""
+msgstr "Knuff sendt"
#: actions/nudge.php:97
msgid "Nudge sent!"
+msgstr "Knuff sendt!"
+
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Du er allerede logget inn!"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
msgstr ""
#: actions/oembed.php:79 actions/shownotice.php:100
@@ -1994,14 +2258,14 @@ msgstr "%1$s sin status på %2$s"
#: actions/oembed.php:157
msgid "content type "
-msgstr ""
+msgstr "innholdstype "
#: actions/oembed.php:160
msgid "Only "
-msgstr ""
+msgstr "Bare "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2014,9 +2278,8 @@ msgid "Notice Search"
msgstr ""
#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Innstillinger for IM"
+msgid "Other settings"
+msgstr "Andre innstillinger"
#: actions/othersettings.php:71
msgid "Manage various other options."
@@ -2070,28 +2333,31 @@ msgstr "Nytt nick"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Utboks for %1$s - side %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
-msgstr ""
+msgstr "Utboks for %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+msgstr "Dette er utboksen din som viser alle private meldinger du har sendt."
#: actions/passwordsettings.php:58
msgid "Change password"
msgstr "Endre passord"
#: actions/passwordsettings.php:69
-#, fuzzy
msgid "Change your password."
-msgstr "Endre passord"
+msgstr "Endre passordet ditt."
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
msgid "Password change"
-msgstr "Passordet ble lagret"
+msgstr "Endre passord"
#: actions/passwordsettings.php:104
msgid "Old password"
@@ -2112,7 +2378,7 @@ msgstr "Bekreft"
#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
msgid "Same as password above"
-msgstr ""
+msgstr "Samme som passord ovenfor"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2120,11 +2386,11 @@ msgstr "Endre"
#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "Passord må være minst 6 tegn."
#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
-msgstr ""
+msgstr "Passordene var ikke like."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
@@ -2142,7 +2408,7 @@ msgstr "Klarer ikke å lagre nytt passord."
msgid "Password saved."
msgstr "Passordet ble lagret"
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2150,138 +2416,153 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Tjener"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Brukerbilde"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Innstillinger for IM"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Brukerbildet har blitt oppdatert."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Brukerbildet har blitt oppdatert."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
-msgstr ""
+msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
-#, fuzzy
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
-msgstr "Gjenopprett"
+msgstr "Aldri"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
-msgstr ""
+msgstr "Noen ganger"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
-msgstr ""
+msgstr "Alltid"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
-msgstr ""
+msgstr "Bruk SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Gjenopprett"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr ""
@@ -2339,7 +2620,7 @@ msgid "Full name"
msgstr "Fullt navn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmesiden"
@@ -2363,7 +2644,7 @@ msgstr "Om meg"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr ""
@@ -2387,13 +2668,13 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Språk"
#: actions/profilesettings.php:152
msgid "Preferred language"
-msgstr ""
+msgstr "Foretrukket språk"
#: actions/profilesettings.php:161
msgid "Timezone"
@@ -2401,7 +2682,7 @@ msgstr "Tidssone"
#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "Hvilken tidssone er du vanligvis i?"
#: actions/profilesettings.php:167
msgid ""
@@ -2410,42 +2691,42 @@ msgstr ""
"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
#: actions/profilesettings.php:228 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "«Om meg» er for lang (maks 140 tegn)."
+msgstr "«Om meg» er for lang (maks %d tegn)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
-msgstr ""
+msgstr "Tidssone ikke valgt."
#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "Språk er for langt (maks 50 tegn)."
#: actions/profilesettings.php:253 actions/tagother.php:178
#, fuzzy, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig hjemmeside '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -2467,37 +2748,37 @@ msgstr ""
msgid "Public timeline"
msgstr ""
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "%s offentlig strøm"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2506,7 +2787,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2539,7 +2820,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2677,7 +2958,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2692,7 +2973,7 @@ msgstr ""
#: actions/register.php:212
msgid "Email address already exists."
-msgstr ""
+msgstr "E-postadressen finnes allerede."
#: actions/register.php:243 actions/register.php:265
msgid "Invalid username or password."
@@ -2715,10 +2996,10 @@ msgstr "6 eller flere tegn. PÃ¥krevd."
#: actions/register.php:434
msgid "Same as password above. Required."
-msgstr ""
+msgstr "Samme som passord over. Kreves."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-post"
@@ -2732,23 +3013,22 @@ msgstr "Lengre navn, helst ditt \"ekte\" navn"
#: actions/register.php:494
msgid "My text and files are available under "
-msgstr ""
+msgstr "Teksten og filene mine er tilgjengelig under "
#: actions/register.php:496
msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "Creative Commons Navngivelse 3.0"
#: actions/register.php:497
-#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
msgstr ""
-"utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
-"telefonnummer."
+" utenom disse private dataene: passord, e-postadresse, lynmeldingsadresse "
+"og telefonnummer."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2765,20 +3045,20 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Gratulerer, %s! Og velkommen til %%%%site.name%%%%. Herfra vil du "
+"Gratulerer, %1$s! Og velkommen til %%%%site.name%%%%. Herfra vil du "
"kanskje...\n"
"\n"
-"* Gå til [din profil](%s) og sende din første notis.\n"
-"* Legge til en [Jabber/GTalk addresse](%%%%action.imsettings%%%%) så du kan "
-"sende notiser fra lynmeldinger.\n"
-"* [Søke etter brukere](%%%%action.peoplesearch%%%%) that you may know or "
-"that share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
+"* Gå til [din profil](%2$s) og sende din første melding.\n"
+"* Legge til en [Jabber/GTalk-addresse](%%%%action.imsettings%%%%) så du kan "
+"sende notiser gjennom lynmeldinger.\n"
+"* [Søke etter brukere](%%%%action.peoplesearch%%%%) som du kanskje kjenner "
+"eller deler dine interesser.\n"
+"* Oppdater dine [profilinnstillinger](%%%%action.profilesettings%%%%) for å "
+"fortelle mer om deg til andre.\n"
+"* Les over [hjelpetekstene](%%%%doc.help%%%%) for funksjoner du kan ha gått "
+"glipp av.\n"
"\n"
-"Thanks for signing up and we hope you enjoy using this service."
+"Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
#: actions/register.php:562
msgid ""
@@ -2821,7 +3101,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -2859,15 +3139,13 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Du er allerede logget inn!"
-#: actions/repeat.php:114 lib/noticelist.php:629
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
-msgstr "Opprett"
+msgstr "Gjentatt"
#: actions/repeat.php:119
-#, fuzzy
msgid "Repeated!"
-msgstr "Opprett"
+msgstr "Gjentatt!"
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -2875,20 +3153,25 @@ msgstr "Opprett"
msgid "Replies to %s"
msgstr "Svar til %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Svar til %1$s, side %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Svarstrøm for %s (RSS 1.0)"
#: actions/replies.php:151
#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Svarstrøm for %s (RSS 2.0)"
#: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "Svar til %s"
+msgstr "Svarstrøm for %s (Atom)"
#: actions/replies.php:198
#, fuzzy, php-format
@@ -2915,9 +3198,13 @@ msgstr ""
"s)."
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "Svar til %s"
+msgstr "Svar til %1$s på %2$s!"
+
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
@@ -2929,6 +3216,121 @@ msgstr "Du er allerede logget inn!"
msgid "User is already sandboxed."
msgstr "Du er allerede logget inn!"
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Innstillinger for IM"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Ikon"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Navn"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Er du sikker på at du vil slette denne notisen?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s og venner"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2978,18 +3380,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Alle abonnementer"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "Klarte ikke å lagre profil."
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr ""
@@ -3036,10 +3443,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistikk"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3095,6 +3498,11 @@ msgstr ""
msgid " tagged %s"
msgstr "Tagger"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s og venner"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3120,18 +3528,18 @@ msgstr ""
msgid "FOAF for %s"
msgstr "Feed for taggen %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, fuzzy, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3141,7 +3549,7 @@ msgstr ""
"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%"
"s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3150,7 +3558,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3158,7 +3566,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Svar til %s"
@@ -3176,199 +3584,144 @@ msgstr "Du er allerede logget inn!"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Ugyldig e-postadresse"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Gjenopprett"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Godta"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr ""
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr ""
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Innstillinger for IM"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3470,17 +3823,26 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Klarte ikke å lagre avatar-informasjonen"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Ugyldig OpenID"
+msgid "No such profile."
+msgstr "Ingen slik fil."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3540,7 +3902,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3550,20 +3912,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s lytter nå til dine notiser på %2$s."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "Ingen Jabber ID."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Mikroblogg av %s"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3593,7 +3960,8 @@ msgstr "Tagger"
msgid "User profile"
msgstr "Klarte ikke å lagre profil."
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3651,7 +4019,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr ""
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3666,89 +4034,69 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "slett"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Alle abonnementer"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Bekreftelseskode"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser abonnementet"
@@ -3760,85 +4108,85 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Godta"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr ""
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr ""
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Alle abonnementer"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr ""
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Kan ikke lese brukerbilde-URL «%s»"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3858,6 +4206,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Alle abonnementer"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3884,11 +4237,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Statistikk"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3920,12 +4268,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Nick"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Personlig"
@@ -3934,11 +4277,6 @@ msgstr "Personlig"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Alle abonnementer"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3988,59 +4326,84 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Alle abonnementer"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Klarte ikke å lagre avatar-informasjonen"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Klarte ikke å lagre avatar-informasjonen"
@@ -4083,131 +4446,126 @@ msgstr "%1$s sin status på %2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Hjem"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "Om"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Koble til"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Opprett en ny konto"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Hjelp"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Om"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "OSS/FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Kilde"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4216,12 +4574,12 @@ msgstr ""
"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4229,33 +4587,55 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Tidligere »"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4286,10 +4666,101 @@ msgstr ""
msgid "Design configuration"
msgstr ""
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr ""
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr ""
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr ""
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr ""
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Kilde"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Fjern"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4311,12 +4782,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Passordet ble lagret"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Passordet ble lagret"
@@ -4468,83 +4939,93 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Ingen slik bruker"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Svar til %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ikke autorisert."
msgstr[1] "Ikke autorisert."
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
msgstr[1] "Svar til %s"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4558,6 +5039,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4585,20 +5067,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Fant ikke bekreftelseskode."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4614,6 +5096,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Koble til"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4803,12 +5294,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5013,7 +5504,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "fra"
@@ -5133,59 +5624,55 @@ msgid "Do not share my location"
msgstr "Klarte ikke å lagre profil."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Opprett"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "svar"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Nytt nick"
@@ -5218,11 +5705,7 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5238,19 +5721,19 @@ msgstr "Svar"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5332,6 +5815,10 @@ msgstr "Kan ikke slette notisen."
msgid "Repeat this notice"
msgstr "Kan ikke slette notisen."
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5403,36 +5890,6 @@ msgstr "Svar til %s"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Alle abonnementer"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5486,68 +5943,68 @@ msgstr "Brukerbilde"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Endre profilinnstillingene dine"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "omtrent ett år siden"
@@ -5561,7 +6018,7 @@ msgstr ""
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index ade4434a5..1cd71ad86 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,17 +10,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:52+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:28+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Toegang"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Instellingen voor sitetoegang"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registratie"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privé"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Mogen anonieme gebruikers (niet aangemeld) de website bekijken?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Alleen op uitnodiging"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Registratie alleen op uitnodiging."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Gesloten"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Nieuwe registraties uitschakelen."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Opslaan"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Toegangsinstellingen opslaan"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +87,29 @@ msgstr "Deze pagina bestaat niet"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Onbekende gebruiker."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s en vrienden, pagina %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -101,7 +157,7 @@ msgstr ""
"bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -114,8 +170,8 @@ msgstr ""
msgid "You and friends"
msgstr "U en vrienden"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates van %1$s en vrienden op %2$s."
@@ -125,23 +181,23 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "De API-functie is niet aangetroffen."
@@ -155,7 +211,7 @@ msgstr "De API-functie is niet aangetroffen."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Deze methode vereist een POST."
@@ -186,8 +242,9 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -308,11 +365,11 @@ msgstr "U kunt het abonnement op uzelf niet opzeggen."
msgid "Two user ids or screen_names must be supplied."
msgstr "Er moeten twee gebruikersnamen of ID's opgegeven worden."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Het was niet mogelijk de brongebruiker te bepalen."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Het was niet mogelijk de doelgebruiker te vinden."
@@ -337,7 +394,8 @@ msgstr ""
msgid "Not a valid nickname."
msgstr "Ongeldige gebruikersnaam!"
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -349,7 +407,8 @@ msgstr "De thuispagina is geen geldige URL."
msgid "Full name is too long (max 255 chars)."
msgstr "De volledige naam is te lang (maximaal 255 tekens)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
@@ -385,7 +444,7 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "De groep is niet aangetroffen!"
@@ -426,6 +485,121 @@ msgstr "%s groepen"
msgid "groups on %s"
msgstr "groepen op %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Er is geen oauth_token parameter opgegeven."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Ongeldig token."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Ongeldige gebruikersnaam of wachtwoord."
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+"Er is een databasefout opgetreden tijdens het verwijderen van de OAuth "
+"applicatiegebruiker."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
+"applicatiegebruiker."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Het verzoektoken %s is geautoriseerd. Wissel het alstublieft uit voor een "
+"toegangstoken."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Het verzoektoken %s is geweigerd en ingetrokken."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Het formulier is onverwacht ingezonden."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Een applicatie vraagt toegang tot uw gebruikersgegevens"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Toegang toestaan of ontzeggen"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"De <strong>applicatie %1$s</strong> van <strong>%2$s</strong> vraagt toegang "
+"van het type \"<strong>%3$s</strong> tot uw gebruikersgegevens. Geef alleen "
+"toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Gebruiker"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Gebruikersnaam"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Ontzeggen"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Toestaan"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Toegang tot uw gebruikersgegevens toestaan of ontzeggen."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Deze methode vereist een POST of DELETE."
@@ -455,17 +629,17 @@ msgstr "De status is verwijderd."
msgid "No status with that ID found."
msgstr "Er is geen status gevonden met dit ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Niet gevonden"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -481,7 +655,7 @@ msgstr "Niet-ondersteund bestandsformaat."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorieten van %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s"
@@ -492,7 +666,7 @@ msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s"
msgid "%s timeline"
msgstr "%s tijdlijn"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -508,27 +682,22 @@ msgstr "%1$s / Updates over %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publieke tijdlijn"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates van iedereen"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Herhaald door %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Herhaald naar %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Herhaald van %s"
@@ -538,7 +707,7 @@ msgstr "Herhaald van %s"
msgid "Notices tagged with %s"
msgstr "Mededelingen met het label %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates met het label %1$s op %2$s!"
@@ -599,8 +768,8 @@ msgstr "Origineel"
msgid "Preview"
msgstr "Voorvertoning"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Verwijderen"
@@ -612,31 +781,6 @@ msgstr "Uploaden"
msgid "Crop"
msgstr "Uitsnijden"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
-"alstublieft."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Het formulier is onverwacht ingezonden."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -676,8 +820,9 @@ msgstr ""
"niet meer volgen en u wordt niet op de hoogte gebracht van \"@\"-antwoorden "
"van deze gebruiker."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Nee"
@@ -685,13 +830,13 @@ msgstr "Nee"
msgid "Do not block this user"
msgstr "Gebruiker niet blokkeren"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
@@ -774,7 +919,7 @@ msgid "Couldn't delete email confirmation."
msgstr "De e-mailbevestiging kon niet verwijderd worden."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Adres bevestigen"
#: actions/confirmaddress.php:159
@@ -791,10 +936,51 @@ msgstr "Dialoog"
msgid "Notices"
msgstr "Mededelingen"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "U moet aangemeld zijn om een applicatie te kunnen verwijderen."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "De applicatie is niet gevonden."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "U bent niet de eigenaar van deze applicatie."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Er is een probleem met uw sessietoken."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Applicatie verwijderen"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Weet u zeker dat u deze applicatie wilt verwijderen? Door deze handeling "
+"worden alle gegevens van deze applicatie uit de database verwijderd, "
+"inclusief alle bestaande gebruikersverbindingen."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Deze applicatie niet verwijderen"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Deze applicatie verwijderen"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -825,7 +1011,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -857,7 +1043,7 @@ msgstr "Gebruiker verwijderen"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:316 lib/groupnav.php:119
msgid "Design"
-msgstr "Ontwerp"
+msgstr "Uiterlijk"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
@@ -958,16 +1144,6 @@ msgstr "Standaardontwerp toepassen"
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Opslaan"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Ontwerp opslaan"
@@ -980,9 +1156,75 @@ msgstr "Deze mededeling staats niet op uw favorietenlijst."
msgid "Add to favorites"
msgstr "Aan favorieten toevoegen"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Onbekend document."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Onbekend document \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Applicatie bewerken"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "U moet aangemeld zijn om een applicatie te kunnen bewerken."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "De applicatie bestaat niet."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Gebruik dit formulier om uw applicatiegegevens te bewerken."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Een naam is verplicht."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "De naam is te lang (maximaal 255 tekens)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Deze naam wordt al gebruikt. Kies een andere."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Een beschrijving is verplicht"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "De bron-URL is te lang."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "De bron-URL is niet geldig."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organisatie is verplicht."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "De organisatienaam is te lang (maximaal 255 tekens)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "De homepage voor een organisatie is verplicht."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "De callback is te lang."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "De callback-URL is niet geldig."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Het was niet mogelijk de applicatie bij te werken."
#: actions/editgroup.php:56
#, php-format
@@ -1011,7 +1253,7 @@ msgstr "de beschrijving is te lang (maximaal %d tekens)"
msgid "Could not update group."
msgstr "Het was niet mogelijk de groep bij te werken."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Het was niet mogelijk de aliassen aan te maken."
@@ -1026,7 +1268,7 @@ msgstr "E-mailvoorkeuren"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr "E-mail ontvangen van %%site.name%% beheren."
+msgstr "Uw e-mailinstellingen op %%site.name%% beheren."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1052,13 +1294,14 @@ msgstr ""
"ongewenste berichten/spam) voor een bericht met nadere instructies."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Annuleren"
#: actions/emailsettings.php:121
msgid "Email address"
-msgstr "E-mailadressen"
+msgstr "E-mailadres"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1080,8 +1323,8 @@ msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-"Stelt een nieuw e-mailadres in voor het plaatsen van berichten; verwijdert "
-"het oude."
+"Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het "
+"bestaande e-mailadres wordt verwijderd."
#: actions/emailsettings.php:148 actions/smssettings.php:164
msgid "New"
@@ -1134,7 +1377,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
@@ -1146,7 +1389,7 @@ msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
msgid "That email address already belongs to another user."
msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "De bevestigingscode kon niet ingevoegd worden."
@@ -1208,7 +1451,7 @@ msgstr "Deze mededeling staat al in uw favorietenlijst."
msgid "Disfavor favorite"
msgstr "Van favotietenlijst verwijderen"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Populaire mededelingen"
@@ -1361,7 +1604,7 @@ msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
msgid "User is not a member of group."
msgstr "De gebruiker is geen lid van de groep."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Gebruiker toegang tot de groep blokkeren"
@@ -1461,23 +1704,23 @@ msgstr "%1$s groeps leden, pagina %2$d"
msgid "A list of the users in this group."
msgstr "Ledenlijst van deze groep"
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Beheerder"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blokkeren"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Deze gebruiker groepsbeheerder maken"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Beheerder maken"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Deze gebruiker beheerder maken"
@@ -1660,6 +1903,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Dit is niet uw Jabber-ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Postvak IN van %s - pagina %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1744,7 +1992,7 @@ msgstr "Persoonlijk bericht"
msgid "Optionally add a personal message to the invitation."
msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Verzenden"
@@ -1846,7 +2094,7 @@ msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
@@ -1855,17 +2103,6 @@ msgstr "Aanmelden"
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Gebruikersnaam"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Wachtwoord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
@@ -1895,21 +2132,21 @@ msgstr ""
"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen "
"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Alleen beheerders kunnen andere gebruikers beheerder maken."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s is al beheerder van de groep \"%2$s\""
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Het was niet mogelijk te bevestigen dat %1$s lid is van de groep %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Het is niet mogelijk %1$s beheerder te maken van de groep %2$s."
@@ -1918,6 +2155,26 @@ msgstr "Het is niet mogelijk %1$s beheerder te maken van de groep %2$s."
msgid "No current status"
msgstr "Geen huidige status"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nieuwe applicatie"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "U moet aangemeld zijn om een applicatie te kunnen registreren."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Gebruik dit formulier om een nieuwe applicatie te registreren."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Een bron-URL is verplicht."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Het was niet mogelijk de applicatie aan te maken."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nieuwe groep"
@@ -2031,6 +2288,54 @@ msgstr "De por is verzonden"
msgid "Nudge sent!"
msgstr "De por is verzonden!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+"U moet aangemeld zijn om een lijst met uw applicaties te kunnen bekijken."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Overige instellingen"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Door u geregistreerde applicaties"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "U hebt nog geen applicaties geregistreerd."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Verbonden applicaties"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+"U hebt de volgende applicaties toegang gegeven tot uw gebruikersgegevens."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "U bent geen gebruiker van die applicatie."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+"Het was niet mogelijk de toegang te ontzeggen voor de volgende applicatie: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+"U hebt geen enkele applicatie geautoriseerd voor toegang tot uw "
+"gebruikersgegevens."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Ontwikkelaars kunnen de registratiegegevens voor hun applicaties bewerken "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Mededeling heeft geen profiel"
@@ -2048,8 +2353,8 @@ msgstr "inhoudstype "
msgid "Only "
msgstr "Alleen "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -2062,7 +2367,7 @@ msgid "Notice Search"
msgstr "Mededeling zoeken"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Overige instellingen"
#: actions/othersettings.php:71
@@ -2113,6 +2418,11 @@ msgstr "Het opgegeven token is ongeldig."
msgid "Login token expired."
msgstr "Het aanmeldtoken is verlopen."
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Postvak UIT voor %1$s - pagina %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2183,7 +2493,7 @@ msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
msgid "Password saved."
msgstr "Het wachtwoord is opgeslagen."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Paden"
@@ -2191,132 +2501,148 @@ msgstr "Paden"
msgid "Path and server settings for this StatusNet site."
msgstr "Pad- en serverinstellingen voor de StatusNet-website."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Er kan niet in de avatarmap geschreven worden: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Er kan niet in de achtergrondmap geschreven worden: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Er kan niet uit de talenmap gelezen worden: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Website"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Server"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Hostnaam van de website server."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Pad"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Websitepad"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Talenpad"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Talenmap"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Nette URL's"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Vormgeving"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Vormgevingsserver"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Vormgevingspad"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Vormgevingsmap"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Avatarserver"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Avatarpad"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Avatarmap"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Achtergronden"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Achtergrondenserver"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Achtergrondpad"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Achtergrondenmap"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Nooit"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Soms"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Altijd"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "SSL gebruiken"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Wanneer SSL gebruikt moet worden"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-server"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Opslagpaden"
@@ -2381,7 +2707,7 @@ msgid "Full name"
msgstr "Volledige naam"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Thuispagina"
@@ -2404,7 +2730,7 @@ msgstr "Beschrijving"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Locatie"
@@ -2430,7 +2756,7 @@ msgstr ""
"Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
"spaties"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Taal"
@@ -2458,7 +2784,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Er is geen tijdzone geselecteerd."
@@ -2471,25 +2797,25 @@ msgstr "Taal is te lang (max 50 tekens)."
msgid "Invalid tag: \"%s\""
msgstr "Ongeldig label: '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
"Het was niet mogelijk de instelling voor automatisch abonneren voor de "
"gebruiker bij te werken."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Het profiel kon niet opgeslagen worden."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Het was niet mogelijk de labels op te slaan."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "De instellingen zijn opgeslagen."
@@ -2511,19 +2837,19 @@ msgstr "Openbare tijdlijn, pagina %d"
msgid "Public timeline"
msgstr "Openbare tijdlijn"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Publieke streamfeed (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Publieke streamfeed (RSS 1.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Publieke streamfeed (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2532,11 +2858,11 @@ msgstr ""
"Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog "
"berichten geplaatst."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "U kunt de eerste zijn die een bericht plaatst!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2544,7 +2870,7 @@ msgstr ""
"Waarom [registreert u geen gebruiker](%%action.register%%) en plaatst u als "
"eerste een bericht?"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2557,7 +2883,7 @@ msgstr ""
"net/). [Registreer nu](%%action.register%%) om mededelingen over uzelf te "
"delen met vrienden, familie en collega's! [Meer lezen...](%%doc.help%%)"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2596,7 +2922,7 @@ msgstr ""
"U kunt een [gebruiker registeren](%%action.register%%) en dan de eerste zijn "
"die er een plaatst!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Woordwolk"
@@ -2741,7 +3067,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -2783,7 +3109,7 @@ msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2890,7 +3216,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abonneren"
@@ -2928,7 +3254,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
msgid "You already repeated that notice."
msgstr "U hent die mededeling al herhaald."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Herhaald"
@@ -2942,6 +3268,11 @@ msgstr "Herhaald!"
msgid "Replies to %s"
msgstr "Antwoorden aan %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Antwoorden aan %1$s, pagina %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2989,6 +3320,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Antwoorden aan %1$s op %2$s."
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Op deze website kunt u gebruikers niet in de zandbak plaatsen."
@@ -2997,6 +3332,122 @@ msgstr "Op deze website kunt u gebruikers niet in de zandbak plaatsen."
msgid "User is already sandboxed."
msgstr "Deze gebruiker is al in de zandbak geplaatst."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessies"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Sessieinstellingen voor deze StatusNet-website."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Sessieafhandeling"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Of sessies door de software zelf afgehandeld moeten worden."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Sessies debuggen"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Debuguitvoer voor sessies inschakelen."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Websiteinstellingen opslaan"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Applicatieprofiel"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Icoon"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Naam"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organisatie"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beschrijving"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistieken"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Aangemaakt door %1$s - standaardtoegang \"%2$s\" - %3$d gebruikers"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Applicatiehandelingen"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Sleutel en wachtwoord op nieuw instellen"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Applicatieinformatie"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Gebruikerssleutel"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Gebruikerswachtwoord"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL voor verzoektoken"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL voor toegangstoken"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Autorisatie-URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in "
+"platte tekst is niet mogelijk."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+"Weet u zeker dat u uw gebruikerssleutel en geheime code wilt verwijderen?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Favoriete mededelingen van %1$s, pagina %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Het was niet mogelijk de favoriete mededelingen op te halen."
@@ -3055,17 +3506,22 @@ msgstr "Dit is de manier om dat te delen wat u wilt."
msgid "%s group"
msgstr "%s groep"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Groep %1$s, pagina %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Groepsprofiel"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Opmerking"
@@ -3111,10 +3567,6 @@ msgstr "(geen)"
msgid "All members"
msgstr "Alle leden"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistieken"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Aangemaakt"
@@ -3179,6 +3631,11 @@ msgstr "Deze mededeling is verwijderd."
msgid " tagged %s"
msgstr " met het label %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, pagina %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3204,13 +3661,13 @@ msgstr "Mededelingenfeed voor %s (Atom)"
msgid "FOAF for %s"
msgstr "Vriend van een vriend (FOAF) voor %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"Dit is de tijdlijn voor %1$s, maar %2$s heeft nog geen berichten verzonden."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3218,7 +3675,7 @@ msgstr ""
"Hebt u recentelijk iets interessants gezien? U hebt nog geen mededelingen "
"verstuurd, dus dit is een ideaal moment om daarmee te beginnen!"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3227,7 +3684,7 @@ msgstr ""
"U kunt proberen %1$s te porren of [een bericht voor die gebruiker plaatsen](%"
"%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3241,7 +3698,7 @@ msgstr ""
"abonneren op de mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%"
"%doc.help%%%%)"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3252,7 +3709,7 @@ msgstr ""
"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
"[StatusNet](http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Herhaald van %s"
@@ -3269,203 +3726,151 @@ msgstr "Deze gebruiker is al gemuilkorfd."
msgid "Basic settings for this StatusNet site."
msgstr "Basisinstellingen voor deze StatusNet-website."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "De sitenaam moet ingevoerd worden en mag niet leeg zijn."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr ""
"U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "De taal \"%s\" is niet bekend."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "De rapportage-URL voor snapshots is ongeldig."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "De waarde voor het uitvoeren van snapshots is ongeldig."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "De snapshotfrequentie moet een getal zijn."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "De minimale tekstlimiet is 140 tekens."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "De duplicaatlimiet moet één of meer seconden zijn."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Algemeen"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Websitenaam"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "De naam van de website, zoals \"UwBedrijf Microblog\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Mogelijk gemaakt door"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
"De tekst die gebruikt worden in de \"creditsverwijzing\" in de voettekst van "
"iedere pagina"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "\"Mogelijk gemaakt door\"-URL"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
"URL die wordt gebruikt voor de verwijzing naar de hoster en dergelijke in de "
"voettekst van iedere pagina"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "E-mailadres om contact op te nemen met de websitebeheerder"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Lokaal"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Standaardtijdzone"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Standaardtijdzone voor de website. Meestal UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Standaardtaal"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL's"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Server"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Hostnaam van de website server."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Nette URL's"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Toegang"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Privé"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Mogen anonieme gebruikers (niet aangemeld) de website bekijken?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Alleen op uitnodiging"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Registratie alleen op uitnodiging."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Gesloten"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Nieuwe registraties uitschakelen."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Snapshots"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Willekeurig tijdens een websitehit"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Als geplande taak"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Snapshots van gegevens"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
"Wanneer statistische gegevens naar de status.net-servers verzonden worden"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frequentie"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Iedere zoveel websitehits wordt een snapshot verzonden"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "Rapportage-URL"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Snapshots worden naar deze URL verzonden"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limieten"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Tekstlimiet"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Maximaal aantal te gebruiken tekens voor mededelingen."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Duplicaatlimiet"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen "
"zenden."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Websiteinstellingen opslaan"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "SMS-instellingen"
@@ -3569,15 +3974,26 @@ msgstr "Er is geen code ingevoerd"
msgid "You are not subscribed to that profile."
msgstr "U bent niet geabonneerd op dat profiel."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Het was niet mogelijk het abonnement op te slaan."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Dit is geen lokale gebruiker."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Het bestand bestaat niet."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "U bent niet geabonneerd op dat profiel."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Geabonneerd"
@@ -3641,7 +4057,7 @@ msgstr "Dit zijn de gebruikers van wie u de mededelingen volgt."
msgid "These are the people whose notices %s listens to."
msgstr "Dit zijn de gebruikers waarvan %s de mededelingen volgt."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3657,19 +4073,24 @@ msgstr ""
"action.twittersettings%%), kunt u automatisch abonneren op de gebruikers die "
"u daar al volgt."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr "%s luistert nergens naar."
+msgstr "%s volgt niemand."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Mededelingen met het label %1$s, pagina %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3698,7 +4119,8 @@ msgstr "Label %s"
msgid "User profile"
msgstr "Gebruikersprofiel"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3759,7 +4181,7 @@ msgstr "Het profiel-ID was niet aanwezig in het verzoek."
msgid "Unsubscribed"
msgstr "Het abonnement is opgezegd"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3776,84 +4198,64 @@ msgstr "Gebruiker"
msgid "User settings for this StatusNet site."
msgstr "Gebruikersinstellingen voor deze StatusNet-website."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Ongeldige beschrijvingslimiet. Het moet een getal zijn."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiel"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Profiellimiet"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "De maximale lengte van de profieltekst in tekens."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nieuwe gebruikers"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Welkom voor nieuwe gebruikers"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Welkomsttekst voor nieuwe gebruikers. Maximaal 255 tekens."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Standaardabonnement"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Nieuwe gebruikers automatisch op deze gebruiker abonneren"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Uitnodigingen"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Uitnodigingen ingeschakeld"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessies"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Sessieafhandeling"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Of sessies door de software zelf afgehandeld moeten worden."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Sessies debuggen"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Debuguitvoer voor sessies inschakelen."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Abonneren"
@@ -3869,36 +4271,36 @@ msgstr ""
"aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
"klik dan op \"Afwijzen\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licentie"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Aanvaarden"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "Abonnement geautoriseerd"
+msgstr "Abonneer mij op deze gebruiker"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Afwijzen"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Dit abonnement weigeren"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Geen autorisatieverzoek!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Het abonnement is geautoriseerd"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3908,11 +4310,11 @@ msgstr ""
"Controleer de instructies van de site voor informatie over het volledig "
"afwijzen van een abonnement. Uw abonnementstoken is:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Het abonnement is afgewezen"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3922,37 +4324,37 @@ msgstr ""
"Controleer de instructies van de site voor informatie over het volledig "
"afwijzen van een abonnement."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "De abonnee-URI \"%s\" is hier niet te vinden."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "De URI \"%s\" voor de stream is te lang."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "de URI \"%s\" voor de stream is een lokale gebruiker."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr "De profiel-URL \"%s\" is niet geldig."
+msgstr "De profiel-URL ‘%s’ is van een lokale gebruiker."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "De avatar-URL \"%s\" is niet geldig."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
@@ -3973,6 +4375,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Geniet van uw hotdog!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Groepen voor %1$s, pagina %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Meer groepen zoeken"
@@ -4002,10 +4409,6 @@ msgstr ""
"Deze website wordt aangedreven door %1$2 versie %2$s. Auteursrechten "
"voorbehouden 2008-2010 Statusnet, Inc. en medewerkers."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Medewerkers"
@@ -4030,9 +4433,9 @@ msgid ""
"for more details. "
msgstr ""
"Dit programma wordt verspreid in de hoop dat het bruikbaar is, maar ZONDER "
-"ENIGE GARANTIE; zonder zelfde impliciete garantie van VERMARKTBAARHEID of "
-"GESCHIKTHEID VOOR EEN SPECIFIEK DOEL. Zie de GNU Affero General Public "
-"License voor meer details. "
+"ENIGE GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of "
+"GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Affero General Public License "
+"voor meer details. "
#: actions/version.php:180
#, php-format
@@ -4047,11 +4450,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plug-ins"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Naam"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versie"
@@ -4059,10 +4458,6 @@ msgstr "Versie"
msgid "Author(s)"
msgstr "Auteur(s)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beschrijving"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4085,19 +4480,16 @@ msgstr ""
"Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Groepsprofiel"
+msgstr "Groepslidmaatschap toevoegen is mislukt."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Het was niet mogelijk de groep bij te werken."
+msgstr "Geen lid van groep."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Groepsprofiel"
+msgstr "Groepslidmaatschap opzeggen is mislukt."
#: classes/Login_token.php:76
#, php-format
@@ -4116,31 +4508,31 @@ msgstr "Het was niet mogelijk het bericht in te voegen."
msgid "Could not update message with new URI."
msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
"lang."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
"onbekend."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer "
"het over enige tijd weer."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4148,36 +4540,60 @@ msgstr ""
"Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
"plaats over een aantal minuten pas weer een bericht."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
msgstr ""
-"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
+"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
+"groep."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "U mag zich niet abonneren."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "U bent al gebonneerd!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Deze gebruiker negeert u."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Niet geabonneerd!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Kon abonnement niet verwijderen."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Het was niet mogelijk de groep aan te maken."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
@@ -4218,128 +4634,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Naamloze pagina"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Start"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Gebruiker"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Koppelen"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Met diensten verbinden"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Uitnodigen"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Afmelden"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Van de site afmelden"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Gebruiker aanmaken"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Bij de site aanmelden"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Help"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Zoeken"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Mededeling van de website"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokale weergaven"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Mededeling van de pagina"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Over"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Veel gestelde vragen"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Broncode"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Widget"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4348,12 +4760,12 @@ msgstr ""
"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is een microblogdienst. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4364,33 +4776,59 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"Auteursrechten op inhoud en gegevens rusten bij %1$s. Alle rechten "
+"voorbehouden."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
+"gebruikers. Alle rechten voorbehouden."
+
+#: lib/action.php:827
msgid "All "
msgstr "Alle "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licentie."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Later"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Eerder"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Er is een probleem met uw sessietoken."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4420,10 +4858,100 @@ msgstr "Basisinstellingen voor de website"
msgid "Design configuration"
msgstr "Instellingen vormgeving"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Gebruikersinstellingen"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Toegangsinstellingen"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Padinstellingen"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Sessieinstellingen"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen "
+"maar leestoegang."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"De API-authenticatie is mislukt. nickname = %1$s, proxy - %2$s, ip = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Applicatie bewerken"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Icoon voor deze applicatie"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Beschrijf uw applicatie in %d tekens"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Beschrijf uw applicatie"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "Bron-URL"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "De URL van de homepage van deze applicatie"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organisatie verantwoordelijk voor deze applicatie"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "De URL van de homepage van de organisatie"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL om naar door te verwijzen na authenticatie"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Browser"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Desktop"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Type applicatie; browser of desktop"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Alleen-lezen"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Lezen en schrijven"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Intrekken"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Bijlagen"
@@ -4444,11 +4972,11 @@ msgstr "Mededelingen die deze bijlage bevatten"
msgid "Tags for this attachment"
msgstr "Labels voor deze bijlage"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Wachtwoord wijzigen is mislukt"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Wachtwoord wijzigen is niet toegestaan"
@@ -4603,83 +5131,93 @@ msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
msgid "Specify the name of the user to subscribe to"
msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "De opgegeven gebruiker bestaat niet"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Geabonneerd op %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Uw abonnement op %s is opgezegd"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificaties uitgeschakeld."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificaties ingeschakeld."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Het aanmeldcommando is uitgeschakeld"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
"geldig: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Uw abonnement op %s is opgezegd"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U bent geabonneerd op deze gebruiker:"
msgstr[1] "U bent geabonneerd op deze gebruikers:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Deze gebruiker is op u geabonneerd:"
msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U bent lid van deze groep:"
msgstr[1] "U bent lid van deze groepen:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4693,6 +5231,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4759,20 +5298,20 @@ msgstr ""
"tracks - nog niet beschikbaar\n"
"tracking - nog niet beschikbaar\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Er is geen instellingenbestand aangetroffen. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -4788,6 +5327,14 @@ msgstr "Updates via instant messenger (IM)"
msgid "Updates by SMS"
msgstr "Updates via SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Verbindingen"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Geautoriseerde verbonden applicaties"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Databasefout"
@@ -4974,15 +5521,15 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "De taal \"%s\" is niet bekend."
+msgstr "Onbekende bron Postvak IN %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5261,7 +5808,7 @@ msgstr ""
"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "van"
@@ -5382,57 +5929,55 @@ msgid "Do not share my location"
msgstr "Mijn locatie niet bekend maken"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Deze informatie verbergen"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Het ophalen van uw geolocatie duurt langer dan verwacht. Probeer het later "
+"nog eens"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Z"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "O"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "W"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "op"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Herhaald door"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Op deze mededeling antwoorden"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Antwoorden"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Mededeling herhaald"
@@ -5465,11 +6010,7 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Duplicaatmelding"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "U mag zich niet abonneren."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Kon nieuw abonnement niet toevoegen."
@@ -5485,19 +6026,19 @@ msgstr "Antwoorden"
msgid "Favorites"
msgstr "Favorieten"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Postvak IN"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Uw inkomende berichten"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Postvak UIT"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Uw verzonden berichten"
@@ -5574,6 +6115,10 @@ msgstr "Deze mededeling herhalen?"
msgid "Repeat this notice"
msgstr "Deze mededeling herhalen"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Zandbak"
@@ -5641,34 +6186,6 @@ msgstr "Gebruikers met een abonnement op %s"
msgid "Groups %s is a member of"
msgstr "Groepen waar %s lid van is"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "U bent al gebonneerd!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Deze gebruiker negeert u."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Kan niet abonneren "
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Niet geabonneerd!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Kon abonnement niet verwijderen."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5719,67 +6236,67 @@ msgstr "Avatar bewerken"
msgid "User actions"
msgstr "Gebruikershandelingen"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Profielinstellingen bewerken"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Bewerken"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Deze gebruiker een direct bericht zenden"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Bericht"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modereren"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
@@ -5793,7 +6310,7 @@ msgstr "%s is geen geldige kleur."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 5bba0e8b0..55918d880 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,17 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:49+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:25+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Godta"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Avatar-innstillingar"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Registrér"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Personvern"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "Invitér"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "Blokkér"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lagra"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Avatar-innstillingar"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -33,25 +92,29 @@ msgstr "Dette emneord finst ikkje."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Brukaren finst ikkje."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s med vener, side %d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,7 +155,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s med vener"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringar frå %1$s og vener på %2$s!"
@@ -115,23 +178,23 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Fann ikkje API-metode."
@@ -146,7 +209,7 @@ msgstr "Fann ikkje API-metode."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Dette krev ein POST."
@@ -177,8 +240,9 @@ msgstr "Kan ikkje lagra profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -299,12 +363,12 @@ msgstr "Kan ikkje oppdatera brukar."
msgid "Two user ids or screen_names must be supplied."
msgstr "To brukar IDer eller kallenamn er naudsynte."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Kan ikkje hente offentleg straum."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Kan ikkje finna einkvan status."
@@ -327,7 +391,8 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
msgid "Not a valid nickname."
msgstr "Ikkje eit gyldig brukarnamn."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -339,7 +404,8 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
msgid "Full name is too long (max 255 chars)."
msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "skildringa er for lang (maks 140 teikn)."
@@ -375,7 +441,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Fann ikkje API-metode."
@@ -419,6 +485,115 @@ msgstr "%s grupper"
msgid "groups on %s"
msgstr "Gruppe handlingar"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Ugyldig storleik."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Ugyldig brukarnamn eller passord."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Feil ved å setja brukar."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Uventa skjemasending."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Kallenamn"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Passord"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Alle"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Dette krev anten ein POST eller DELETE."
@@ -451,17 +626,17 @@ msgstr "Lasta opp brukarbilete."
msgid "No status with that ID found."
msgstr "Fann ingen status med den ID-en."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Fann ikkje"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -476,7 +651,7 @@ msgstr "Støttar ikkje bileteformatet."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favorittar frå %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s oppdateringar favorisert av %s / %s."
@@ -487,7 +662,7 @@ msgstr "%s oppdateringar favorisert av %s / %s."
msgid "%s timeline"
msgstr "%s tidsline"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -503,27 +678,22 @@ msgstr "%1$s / Oppdateringar som svarar til %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentleg tidsline"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringar frå alle saman!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Svar til %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Svar til %s"
@@ -533,7 +703,7 @@ msgstr "Svar til %s"
msgid "Notices tagged with %s"
msgstr "Notisar merka med %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
@@ -594,8 +764,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Forhandsvis"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Slett"
@@ -607,29 +777,6 @@ msgstr "Last opp"
msgid "Crop"
msgstr "Skaler"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Uventa skjemasending."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Velg eit utvalg av bildet som vil blir din avatar."
@@ -667,8 +814,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Nei"
@@ -677,13 +825,13 @@ msgstr "Nei"
msgid "Do not block this user"
msgstr "LÃ¥s opp brukaren"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Jau"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkér denne brukaren"
@@ -769,7 +917,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Kan ikkje sletta e-postgodkjenning."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Stadfest adresse"
#: actions/confirmaddress.php:159
@@ -787,10 +936,54 @@ msgstr "Stadfestingskode"
msgid "Notices"
msgstr "Notisar"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Du må være logga inn for å lage ei gruppe."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Notisen har ingen profil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Det var eit problem med sesjons billetten din."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Kan ikkje sletta notisen."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Slett denne notisen"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -823,7 +1016,7 @@ msgstr "Sikker på at du vil sletta notisen?"
msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -965,16 +1158,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Lagra"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -987,10 +1170,87 @@ msgstr "Denne notisen er ikkje ein favoritt!"
msgid "Add to favorites"
msgstr "Legg til i favorittar"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Slikt dokument finst ikkje."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Andre val"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Du må være logga inn for å lage ei gruppe."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Bruk dette skjemaet for å redigere gruppa"
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Samme som passord over. PÃ¥krevd."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Beskriving"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Heimesida er ikkje ei gyldig internettadresse."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Kann ikkje oppdatera gruppa."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1019,7 +1279,7 @@ msgstr "skildringa er for lang (maks 140 teikn)."
msgid "Could not update group."
msgstr "Kann ikkje oppdatera gruppa."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Kunne ikkje lagre favoritt."
@@ -1062,7 +1322,8 @@ msgstr ""
"med instruksjonar."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Avbryt"
@@ -1145,7 +1406,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
@@ -1157,7 +1418,7 @@ msgstr "Det er alt din epost addresse"
msgid "That email address already belongs to another user."
msgstr "Den epost addressa er alt registrert hos ein annan brukar."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Kan ikkje leggja til godkjenningskode."
@@ -1218,7 +1479,7 @@ msgstr "Denne notisen er alt ein favoritt!"
msgid "Disfavor favorite"
msgstr "Fjern favoritt"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Populære notisar"
@@ -1373,7 +1634,7 @@ msgstr "Brukar har blokkert deg."
msgid "User is not a member of group."
msgstr "Du er ikkje medlem av den gruppa."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Blokker brukaren"
@@ -1474,25 +1735,25 @@ 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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blokkér"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
#, fuzzy
msgid "Make user an admin of the group"
msgstr "Du må være administrator for å redigere gruppa"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
#, fuzzy
msgid "Make Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1666,6 +1927,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Det er ikkje din Jabber ID."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Innboks for %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1747,7 +2013,7 @@ msgstr "Personleg melding"
msgid "Optionally add a personal message to the invitation."
msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Send"
@@ -1843,7 +2109,7 @@ msgstr "Feil brukarnamn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -1852,17 +2118,6 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Kallenamn"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Passord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Hugs meg"
@@ -1893,21 +2148,21 @@ msgstr ""
"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
"%)."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "Brukar har blokkert deg."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Du må være administrator for å redigere gruppa"
@@ -1916,6 +2171,30 @@ msgstr "Du må være administrator for å redigere gruppa"
msgid "No current status"
msgstr "Ingen status"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Du må være logga inn for å lage ei gruppe."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Kunne ikkje lagre favoritt."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ny gruppe"
@@ -2027,6 +2306,51 @@ msgstr "Dytta!"
msgid "Nudge sent!"
msgstr "Dytta!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Du må være logga inn for å lage ei gruppe."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Andre val"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Notisen har ingen profil"
@@ -2045,8 +2369,8 @@ msgstr "Kopla til"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -2059,7 +2383,8 @@ msgid "Notice Search"
msgstr "Notissøk"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Andre innstillingar"
#: actions/othersettings.php:71
@@ -2116,6 +2441,11 @@ msgstr "Ugyldig notisinnhald"
msgid "Login token expired."
msgstr "Logg inn "
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Utboks for %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2186,7 +2516,7 @@ msgstr "Klarar ikkje lagra nytt passord."
msgid "Password saved."
msgstr "Lagra passord."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2194,142 +2524,159 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Invitér"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "Gjenopprett"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Statusmelding"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Brukarbilete"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Avatar-innstillingar"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Lasta opp brukarbilete."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Lasta opp brukarbilete."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Gjenopprett"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Notisar"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Gjenopprett"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Statusmelding"
@@ -2393,7 +2740,7 @@ msgid "Full name"
msgstr "Fullt namn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimeside"
@@ -2417,7 +2764,7 @@ msgstr "Om meg"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Plassering"
@@ -2443,7 +2790,7 @@ msgstr ""
"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
"mellomroms separert."
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Språk"
@@ -2470,7 +2817,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Tidssone er ikkje valt."
@@ -2483,24 +2830,24 @@ msgstr "Språk er for langt (maksimalt 50 teikn)."
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig merkelapp: %s"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Kan ikkje lagra merkelapp."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Kan ikkje lagra profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Kan ikkje lagra merkelapp."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Lagra innstillingar."
@@ -2522,39 +2869,39 @@ msgstr "Offentleg tidsline, side %d"
msgid "Public timeline"
msgstr "Offentleg tidsline"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Offentleg straum"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Offentleg straum"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Offentleg straum"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2563,7 +2910,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2598,7 +2945,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Emne sky"
@@ -2737,7 +3084,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -2779,7 +3126,7 @@ msgid "Same as password above. Required."
msgstr "Samme som passord over. PÃ¥krevd."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -2887,7 +3234,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Ting"
@@ -2930,7 +3277,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
msgid "You already repeated that notice."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Lag"
@@ -2946,6 +3293,11 @@ msgstr "Lag"
msgid "Replies to %s"
msgstr "Svar til %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Melding til %1$s på %2$s"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2987,6 +3339,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Melding til %1$s på %2$s"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Lasta opp brukarbilete."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2997,6 +3354,125 @@ msgstr "Du kan ikkje sende melding til denne brukaren."
msgid "User is already sandboxed."
msgstr "Brukar har blokkert deg."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Avatar-innstillingar"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Notisen har ingen profil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Kallenamn"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Paginering"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beskriving"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Sikker på at du vil sletta notisen?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s's favoritt meldingar"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Kunne ikkje hente fram favorittane."
@@ -3046,17 +3522,22 @@ msgstr ""
msgid "%s group"
msgstr "%s gruppe"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%s medlemmar i gruppa, side %d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Gruppe profil"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Merknad"
@@ -3102,10 +3583,6 @@ msgstr "(Ingen)"
msgid "All members"
msgstr "Alle medlemmar"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistikk"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3165,6 +3642,11 @@ msgstr "Melding lagra"
msgid " tagged %s"
msgstr "Notisar merka med %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s med vener, side %d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3190,25 +3672,25 @@ msgstr "Notisstraum for %s"
msgid "FOAF for %s"
msgstr "Utboks for %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3217,7 +3699,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3227,7 +3709,7 @@ msgstr ""
"**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
"wikipedia.org/wiki/Micro-blogging)-teneste"
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Svar til %s"
@@ -3246,207 +3728,148 @@ msgstr "Brukar har blokkert deg."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Ikkje ei gyldig epostadresse"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Statusmelding"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Ny epostadresse for å oppdatera %s"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Lokale syningar"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "Foretrukke språk"
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "URL"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Gjenopprett"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Godta"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Personvern"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Invitér"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Blokkér"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Avatar-innstillingar"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3553,15 +3976,26 @@ msgstr "Ingen innskriven kode"
msgid "You are not subscribed to that profile."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Kunne ikkje lagra abonnement."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ikkje ein lokal brukar."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Denne notisen finst ikkje."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonnent"
@@ -3621,7 +4055,7 @@ msgstr "Dette er dei du lyttar til."
msgid "These are the people whose notices %s listens to."
msgstr "Dette er folka som %s tingar oppdateringar frå."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3631,19 +4065,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s høyrer no på"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Brukarar sjølv-merka med %s, side %d"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3673,7 +4112,8 @@ msgstr "Merkelapp %s"
msgid "User profile"
msgstr "Brukarprofil"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Bilete"
@@ -3737,7 +4177,7 @@ msgstr "Ingen profil-ID i førespurnaden."
msgid "Unsubscribed"
msgstr "Fjerna tinging"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3752,90 +4192,70 @@ msgstr "Brukar"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "Invitér nye brukarar"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Alle tingingar"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr ""
"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Invitasjon(er) sendt"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "Invitasjon(er) sendt"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser tinging"
@@ -3850,38 +4270,38 @@ msgstr ""
"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
#, fuzzy
msgid "License"
msgstr "lisens."
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Godta"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Lagre tinging for brukar: %s"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Avslå"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "%s tingarar"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Ingen autoriserings-spørjing!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Tinging autorisert"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3892,11 +4312,11 @@ msgstr ""
"Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
"gjennomførast. Ditt tingings teikn er: "
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Tinging avvist"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3906,37 +4326,37 @@ msgstr ""
"Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
"med sida sine instruksjonar for korleis ein skal avvise tinginga."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Feil biletetype for '%s'"
@@ -3956,6 +4376,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%s medlemmar i gruppa, side %d"
+
#: actions/usergroups.php:130
#, fuzzy
msgid "Search for more groups"
@@ -3983,11 +4408,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Lasta opp brukarbilete."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4019,12 +4439,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Kallenamn"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Personleg"
@@ -4033,10 +4448,6 @@ msgstr "Personleg"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beskriving"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4087,27 +4498,27 @@ msgstr "Kunne ikkje lagre melding."
msgid "Could not update message with new URI."
msgstr "Kunne ikkje oppdatere melding med ny URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Feil ved lagring av notis. Ukjend brukar."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4115,34 +4526,61 @@ msgid ""
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Databasefeil, kan ikkje lagra svar: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Brukar har blokkert deg."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ikkje tinga."
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Kan ikkje sletta tinging."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Kan ikkje sletta tinging."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Melding til %1$s på %2$s"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Kunne ikkje laga gruppa."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Kunne ikkje bli med i gruppa."
@@ -4184,131 +4622,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Ingen tittel"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Heim"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Konto"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Endra e-posten, avataren, passordet eller profilen"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Kopla til"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitér"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Logg ut or sida"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Opprett ny konto"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Statusmelding"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokale syningar"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Sidenotis"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Om"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "OSS"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Personvern"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Kjeldekode"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Dult"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4317,12 +4751,12 @@ msgstr ""
"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4333,34 +4767,56 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "Alle"
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "lisens."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Før »"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Det var eit problem med sesjons billetten din."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4397,11 +4853,105 @@ msgstr "Stadfesting av epostadresse"
msgid "Design configuration"
msgstr "SMS bekreftelse"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS bekreftelse"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS bekreftelse"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS bekreftelse"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS bekreftelse"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Beskriv gruppa eller emnet med 140 teikn"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Beskriv gruppa eller emnet med 140 teikn"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Kjeldekode"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Fjern"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4423,12 +4973,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Endra passord"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Endra passord"
@@ -4582,83 +5132,92 @@ msgstr "Eit problem oppstod ved lagring av notis."
msgid "Specify the name of the user to subscribe to"
msgstr "Spesifer namnet til brukaren du vil tinge"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Brukaren finst ikkje."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Tingar %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Tingar ikkje %s lengre"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Kommando ikkje implementert."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notifikasjon av."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Kan ikkje skru av notifikasjon."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notifikasjon på."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Tingar ikkje %s lengre"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er ikkje medlem av den gruppa."
msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4672,6 +5231,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4699,20 +5259,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen stadfestingskode."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -4729,6 +5289,15 @@ msgstr "Oppdateringar over direktemeldingar (IM)"
msgid "Updates by SMS"
msgstr "Oppdateringar over SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Kopla til"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4916,12 +5485,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5131,7 +5700,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " frå "
@@ -5250,60 +5819,56 @@ msgid "Do not share my location"
msgstr "Kan ikkje lagra merkelapp."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Nei"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Ingen innhald."
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Lag"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Melding lagra"
@@ -5337,12 +5902,7 @@ msgstr "Feil med å henta inn ekstern profil"
msgid "Duplicate notice"
msgstr "Slett notis"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Kan ikkje leggja til ny tinging."
@@ -5358,19 +5918,19 @@ msgstr "Svar"
msgid "Favorites"
msgstr "Favorittar"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Innboks"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Dine innkomande meldinger"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Utboks"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Dine sende meldingar"
@@ -5452,6 +6012,10 @@ msgstr "Svar på denne notisen"
msgid "Repeat this notice"
msgstr "Svar på denne notisen"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5525,36 +6089,6 @@ msgstr "Mennesker som tingar %s"
msgid "Groups %s is a member of"
msgstr "Grupper %s er medlem av"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Brukar har blokkert deg."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Kan ikkje tinga."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Kan ikkje tinga andre til deg."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ikkje tinga."
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Kan ikkje sletta tinging."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Kan ikkje sletta tinging."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5608,68 +6142,68 @@ msgstr "Brukarbilete"
msgid "User actions"
msgstr "Brukarverkty"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Profilinnstillingar"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Send ei direktemelding til denne brukaren"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Melding"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
@@ -5683,7 +6217,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 9e8414dc1..79b37a5e4 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:55+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:31+0000\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,63 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Dostęp"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Ustawienia dostępu witryny"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Rejestracja"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Prywatna"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać witrynę?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Tylko zaproszeni"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Rejestracja tylko za zaproszeniem."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Zamknięte"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Wyłączenie nowych rejestracji."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Zapisz"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Zapisz ustawienia dostępu"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -38,25 +90,29 @@ msgstr "Nie ma takiej strony"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Brak takiego użytkownika."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s i przyjaciele, strona %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -104,7 +160,7 @@ msgstr ""
"[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -117,8 +173,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ty i przyjaciele"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
@@ -128,23 +184,23 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Nie odnaleziono metody API."
@@ -158,7 +214,7 @@ msgstr "Nie odnaleziono metody API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Ta metoda wymaga POST."
@@ -188,8 +244,9 @@ msgstr "Nie można zapisać profilu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -308,11 +365,11 @@ msgstr "Nie można zrezygnować z obserwacji samego siebie."
msgid "Two user ids or screen_names must be supplied."
msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Nie można określić użytkownika źródłowego."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Nie można odnaleźć użytkownika docelowego."
@@ -334,7 +391,8 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
msgid "Not a valid nickname."
msgstr "To nie jest prawidłowy pseudonim."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -346,7 +404,8 @@ msgstr "Strona domowa nie jest prawidłowym adresem URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Opis jest za długi (maksymalnie %d znaków)."
@@ -382,7 +441,7 @@ msgstr "Alias nie może być taki sam jak pseudonim."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Nie odnaleziono grupy."
@@ -423,6 +482,114 @@ msgstr "Grupy %s"
msgid "groups on %s"
msgstr "grupy na %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Nie podano parametru oauth_token."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Nieprawidłowy token."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Nieprawidłowy pseudonim/hasło."
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Błąd bazy danych podczas usuwania użytkownika aplikacji OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Token żądania %s został upoważniony. Proszę wymienić go na token dostępu."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Token żądania %s został odrzucony lub unieważniony."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Nieoczekiwane wysłanie formularza."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Aplikacja chce połączyć się z kontem użytkownika"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Zezwolić czy odmówić dostęp"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Aplikacja <strong>%1$s</strong> autorstwa <strong>%2$s</strong> chciałaby "
+"uzyskać możliwość <strong>%3$s</strong> danych konta %4$s. Dostęp do konta %4"
+"$s powinien być udostępniany tylko zaufanym osobom trzecim."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Pseudonim"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Hasło"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Odrzuć"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Zezwól"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Zezwól lub odmów dostęp do informacji konta."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Ta metoda wymaga POST lub DELETE."
@@ -452,17 +619,17 @@ msgstr "Usunięto stan."
msgid "No status with that ID found."
msgstr "Nie odnaleziono stanów z tym identyfikatorem."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Nie odnaleziono"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
@@ -476,7 +643,7 @@ msgstr "Nieobsługiwany format."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s/ulubione wpisy od %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s."
@@ -487,7 +654,7 @@ msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s."
msgid "%s timeline"
msgstr "Oś czasu użytkownika %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -503,27 +670,22 @@ msgstr "%1$s/aktualizacje wspominajÄ…ce %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Publiczna oś czasu użytkownika %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Użytkownik %s aktualizuje od każdego."
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Powtórzone przez użytkownika %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Powtórzone dla %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Powtórzenia %s"
@@ -533,7 +695,7 @@ msgstr "Powtórzenia %s"
msgid "Notices tagged with %s"
msgstr "Wpisy ze znacznikiem %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
@@ -593,8 +755,8 @@ msgstr "Oryginał"
msgid "Preview"
msgstr "PodglÄ…d"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Usuń"
@@ -606,29 +768,6 @@ msgstr "Wyślij"
msgid "Crop"
msgstr "Przytnij"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Nieoczekiwane wysłanie formularza."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Wybierz kwadratowy obszar obrazu do awatara"
@@ -667,8 +806,9 @@ msgstr ""
"do ciebie zostanie usunięta, nie będzie mógł cię subskrybować w przyszłości "
"i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Nie"
@@ -676,13 +816,13 @@ msgstr "Nie"
msgid "Do not block this user"
msgstr "Nie blokuj tego użytkownika"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Tak"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
@@ -765,7 +905,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Nie można usunąć potwierdzenia adresu e-mail."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Potwierdź adres"
#: actions/confirmaddress.php:159
@@ -782,10 +922,50 @@ msgstr "Rozmowa"
msgid "Notices"
msgstr "Wpisy"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Musisz być zalogowany, aby usunąć aplikację."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Nie odnaleziono aplikacji."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Nie jesteś właścicielem tej aplikacji."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Wystąpił problem z tokenem sesji."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Usuń aplikację"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Na pewno usunąć tę aplikację? Wyczyści to wszystkie dane o aplikacji z bazy "
+"danych, w tym wszystkie istniejące połączenia użytkowników."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Nie usuwaj tej aplikacji"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Usuń tę aplikację"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -816,7 +996,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Usuń ten wpis"
@@ -851,7 +1031,7 @@ msgstr "WyglÄ…d"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr "Ustawienia wyglÄ…du tej strony StatusNet."
+msgstr "Ustawienia wyglÄ…du tej witryny StatusNet."
#: actions/designadminpanel.php:275
msgid "Invalid logo URL."
@@ -868,7 +1048,7 @@ msgstr "Zmień logo"
#: actions/designadminpanel.php:380
msgid "Site logo"
-msgstr "Logo strony"
+msgstr "Logo witryny"
#: actions/designadminpanel.php:387
msgid "Change theme"
@@ -876,11 +1056,11 @@ msgstr "Zmień motyw"
#: actions/designadminpanel.php:404
msgid "Site theme"
-msgstr "Motyw strony"
+msgstr "Motyw witryny"
#: actions/designadminpanel.php:405
msgid "Theme for the site."
-msgstr "Motyw strony."
+msgstr "Motyw witryny."
#: actions/designadminpanel.php:417 lib/designsettings.php:101
msgid "Change background image"
@@ -896,7 +1076,7 @@ msgstr "Tło"
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "Można wysłać obraz tła dla strony. Maksymalny rozmiar pliku to %1$s."
+msgstr "Można wysłać obraz tła dla witryny. Maksymalny rozmiar pliku to %1$s."
#: actions/designadminpanel.php:457 lib/designsettings.php:139
msgid "On"
@@ -946,16 +1126,6 @@ msgstr "Przywróć domyślny wygląd"
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Zapisz"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Zapisz wyglÄ…d"
@@ -968,9 +1138,75 @@ msgstr "Ten wpis nie jest ulubiony."
msgid "Add to favorites"
msgstr "Dodaj do ulubionych"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Nie ma takiego dokumentu."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Nie ma takiego dokumentu \\\"%s\\\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Zmodyfikuj aplikacjÄ™"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Musisz być zalogowany, aby zmodyfikować aplikację."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Nie ma takiej aplikacji."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Użyj tego formularza, aby zmodyfikować aplikację."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Nazwa jest wymagana."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Nazwa jest za długa (maksymalnie 255 znaków)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Nazwa jest już używana. Spróbuj innej."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Opis jest wymagany."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "Źródłowy adres URL jest za długi."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Źródłowy adres URL jest nieprawidłowy."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organizacja jest wymagana."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organizacja jest za długa (maksymalnie 255 znaków)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Strona domowa organizacji jest wymagana."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Adres zwrotny jest za długi."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "Adres zwrotny URL jest nieprawidłowy."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Nie można zaktualizować aplikacji."
#: actions/editgroup.php:56
#, php-format
@@ -999,7 +1235,7 @@ msgstr "opis jest za długi (maksymalnie %d znaków)."
msgid "Could not update group."
msgstr "Nie można zaktualizować grupy."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Nie można utworzyć aliasów."
@@ -1041,7 +1277,8 @@ msgstr ""
"instrukcjami."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Anuluj"
@@ -1121,7 +1358,7 @@ msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
@@ -1133,7 +1370,7 @@ msgstr "Ten adres e-mail jest już twój."
msgid "That email address already belongs to another user."
msgstr "Ten adres e-mail należy już do innego użytkownika."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Nie można wprowadzić kodu potwierdzającego."
@@ -1195,7 +1432,7 @@ msgstr "Ten wpis jest już ulubiony."
msgid "Disfavor favorite"
msgstr "Usuń wpis z ulubionych"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Popularne wpisy"
@@ -1207,7 +1444,7 @@ msgstr "Popularne wpisy, strona %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "Najpopularniejsze wpisy na stronie w te chwili."
+msgstr "Najpopularniejsze wpisy na witrynie w te chwili."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1343,7 +1580,7 @@ msgstr "Użytkownik został już zablokował w grupie."
msgid "User is not a member of group."
msgstr "Użytkownik nie jest członkiem grupy."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Zablokuj użytkownika w grupie"
@@ -1437,23 +1674,23 @@ msgstr "Członkowie grupy %1$s, strona %2$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/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Zablokuj"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Uczyń użytkownika administratorem grupy"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Uczyń administratorem"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Uczyń tego użytkownika administratorem"
@@ -1633,6 +1870,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "To nie jest twój identyfikator Jabbera."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Odebrane wiadomości użytkownika %1$s - strona %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1691,7 +1933,7 @@ msgid ""
"on the site. Thanks for growing the community!"
msgstr ""
"Zostaniesz powiadomiony, kiedy ktoÅ› zaakceptuje zaproszenie i zarejestruje "
-"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności."
+"się na witrynie. Dziękujemy za pomoc w zwiększaniu społeczności."
#: actions/invite.php:162
msgid ""
@@ -1716,7 +1958,7 @@ msgstr "Osobista wiadomość"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Wyślij"
@@ -1816,25 +2058,14 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło."
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj siÄ™"
#: actions/login.php:227
msgid "Login to site"
-msgstr "Zaloguj siÄ™ na stronie"
-
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Hasło"
+msgstr "Zaloguj siÄ™ na witrynie"
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
@@ -1867,21 +2098,21 @@ msgstr ""
"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
"[Zarejestruj](%%action.register%%) nowe konto."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Tylko administrator może uczynić innego użytkownika administratorem."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "Użytkownika %1$s jest już administratorem grupy \"%2$s\"."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Nie można uzyskać wpisu członkostwa użytkownika %1$s w grupie %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Nie można uczynić %1$s administratorem grupy %2$s."
@@ -1890,6 +2121,26 @@ msgstr "Nie można uczynić %1$s administratorem grupy %2$s."
msgid "No current status"
msgstr "Brak obecnego stanu"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nowa aplikacja"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Musisz być zalogowany, aby zarejestrować aplikację."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Użyj tego formularza, aby zarejestrować aplikację."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Źródłowy adres URL jest wymagany."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Nie można utworzyć aplikacji."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Nowa grupa"
@@ -2003,6 +2254,48 @@ msgstr "Wysłano szturchnięcie"
msgid "Nudge sent!"
msgstr "Wysłano szturchnięcie."
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Musisz być zalogowany, aby wyświetlić listę aplikacji."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Aplikacje OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Zarejestrowane aplikacje"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Nie zarejestrowano jeszcze żadnych aplikacji."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Połączone aplikacje"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Zezwolono następującym aplikacjom na dostęp do konta."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Nie jesteś użytkownikiem tej aplikacji."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Nie można unieważnić dostępu dla aplikacji: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Nie upoważniono żadnych aplikacji do używania konta."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr "Programiści mogą zmodyfikować ustawienia rejestracji swoich aplikacji "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Wpis nie posiada profilu"
@@ -2020,8 +2313,8 @@ msgstr "typ zawartości "
msgid "Only "
msgstr "Tylko "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -2034,7 +2327,7 @@ msgid "Notice Search"
msgstr "Wyszukiwanie wpisów"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Inne ustawienia"
#: actions/othersettings.php:71
@@ -2085,6 +2378,11 @@ msgstr "Podano nieprawidłowy token logowania."
msgid "Login token expired."
msgstr "Token logowania wygasł."
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Wysłane wiadomości użytkownika %1$s - strona %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2155,140 +2453,158 @@ msgstr "Nie można zapisać nowego hasła."
msgid "Password saved."
msgstr "Zapisano hasło."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Ścieżki"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr "Ustawienia ścieżki i serwera dla tej strony StatusNet."
+msgstr "Ustawienia ścieżki i serwera dla tej witryny StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Katalog motywu jest nieczytelny: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Katalog awatara jest niezapisywalny: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Katalog tła jest niezapisywalny: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Katalog lokalizacji jest nieczytelny: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Nieprawidłowy serwer SSL. Maksymalna długość to 255 znaków."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
-msgstr "Strona"
+msgstr "Witryny"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Serwer"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Nazwa komputera serwera strony."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Ścieżka"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
-msgstr "Ścieżka do strony"
+msgstr "Ścieżka do witryny"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Ścieżka do lokalizacji"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Ścieżka do katalogu lokalizacji"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Eleganckie adresu URL"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+"Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
+"adresów URL?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Motyw"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Serwer motywu"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Ścieżka do motywu"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Katalog motywu"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Awatary"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Serwer awatara"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Ścieżka do awatara"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Katalog awatara"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Tła"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Serwer tła"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Ścieżka do tła"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Katalog tła"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Nigdy"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Czasem"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Zawsze"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Użycie SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Kiedy używać SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "Serwer SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Serwer do przekierowywania żądań SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Ścieżki zapisu"
@@ -2323,7 +2639,7 @@ msgstr "Nieprawidłowa zawartość wpisu"
#: actions/postnotice.php:90
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencjÄ… strony \"%2$s\"."
+msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencjÄ… witryny \"%2$s\"."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2351,13 +2667,13 @@ msgid "Full name"
msgstr "ImiÄ™ i nazwisko"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
#: actions/profilesettings.php:117 actions/register.php:455
msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
+msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
#: actions/profilesettings.php:122 actions/register.php:461
#, php-format
@@ -2374,7 +2690,7 @@ msgstr "O mnie"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Położenie"
@@ -2400,7 +2716,7 @@ msgstr ""
"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
"spacjami"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Język"
@@ -2427,7 +2743,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Nie wybrano strefy czasowej."
@@ -2440,23 +2756,23 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
msgid "Invalid tag: \"%s\""
msgstr "Nieprawidłowy znacznik: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Nie można zapisać preferencji położenia."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Nie można zapisać profilu."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Nie można zapisać znaczników."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Zapisano ustawienia."
@@ -2478,19 +2794,19 @@ msgstr "Publiczna oÅ› czasu, strona %d"
msgid "Public timeline"
msgstr "Publiczna oÅ› czasu"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Kanał publicznego strumienia (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Kanał publicznego strumienia (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Kanał publicznego strumienia (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2499,11 +2815,11 @@ msgstr ""
"To jest publiczna oÅ› czasu dla %%site.name%%, ale nikt jeszcze nic nie "
"wysłał."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Zostań pierwszym, który coś wyśle."
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2511,7 +2827,7 @@ msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
"pierwszym, który coś wyśle."
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2524,7 +2840,7 @@ msgstr ""
"[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
"przyjaciółmi, rodziną i kolegami. ([Przeczytaj więcej](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2562,7 +2878,7 @@ msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
"pierwszym, który go wyśle."
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Chmura znaczników"
@@ -2702,7 +3018,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj siÄ™"
@@ -2746,7 +3062,7 @@ msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2824,7 +3140,7 @@ msgid ""
msgstr ""
"Aby subskrybować, można [zalogować się](%%action.login%%) lub [zarejestrować]"
"(%%action.register%%) nowe konto. Jeśli już posiadasz konto na [zgodnej "
-"stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej adres URL "
+"witrynie mikroblogowania](%%doc.openmublog%%), podaj poniżej adres URL "
"profilu."
#: actions/remotesubscribe.php:112
@@ -2852,7 +3168,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subskrybuj"
@@ -2890,7 +3206,7 @@ msgstr "Nie można powtórzyć własnego wpisu."
msgid "You already repeated that notice."
msgstr "Już powtórzono ten wpis."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Powtórzono"
@@ -2904,6 +3220,11 @@ msgstr "Powtórzono."
msgid "Replies to %s"
msgstr "Odpowiedzi na %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "odpowiedzi dla użytkownika %1$s, strona %2$s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2951,14 +3272,133 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
-msgstr "Nie można ograniczać użytkowników na tej stronie."
+msgstr "Nie można ograniczać użytkowników na tej witrynie."
#: actions/sandbox.php:72
msgid "User is already sandboxed."
msgstr "Użytkownik jest już ograniczony."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sesje"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Ustawienia sesji tej witryny StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Obsługa sesji"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Czy samodzielnie obsługiwać sesje."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Debugowanie sesji"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Włącza wyjście debugowania dla sesji."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Zapisz ustawienia witryny"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Musisz być zalogowany, aby wyświetlić aplikację."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Profil aplikacji"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Ikona"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nazwa"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organizacja"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Opis"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statystyki"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Czynności aplikacji"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Przywrócenie klucza i sekretu"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Informacje o aplikacji"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Klucz klienta"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Sekret klienta"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "Adres URL tokenu żądania"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "Adres URL tokenu żądania"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Adres URL upoważnienia"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu w zwykłym tekście "
+"nie jest obsługiwana."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Jesteś pewien, że chcesz przywrócić klucz i sekret klienta?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Ulubione wpisy użytkownika %1$s, strona %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Nie można odebrać ulubionych wpisów."
@@ -3016,17 +3456,22 @@ msgstr "To jest sposób na współdzielenie tego, co chcesz."
msgid "%s group"
msgstr "Grupa %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Grupa %1$s, strona %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Profil grupy"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "Adres URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Wpis"
@@ -3072,10 +3517,6 @@ msgstr "(Brak)"
msgid "All members"
msgstr "Wszyscy członkowie"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statystyki"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Utworzono"
@@ -3140,6 +3581,11 @@ msgstr "Usunięto wpis."
msgid " tagged %s"
msgstr " ze znacznikiem %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, strona %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3165,13 +3611,13 @@ msgstr "Kanał wpisów dla %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF dla %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
"To jest oś czasu dla użytkownika %1$s, ale %2$s nie nic jeszcze nie wysłał."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3179,7 +3625,7 @@ msgstr ""
"Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
"teraz jest dobry czas, aby zacząć. :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3188,7 +3634,7 @@ msgstr ""
"Można spróbować szturchnąć użytkownika %1$s lub [wysłać coś, co wymaga jego "
"uwagi](%%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3202,7 +3648,7 @@ msgstr ""
"obserwować wpisy użytkownika **%s** i wiele więcej. ([Przeczytaj więcej](%%%%"
"doc.help%%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3213,14 +3659,14 @@ msgstr ""
"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
"(http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Powtórzenia %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr "Nie można wyciszać użytkowników na tej stronie."
+msgstr "Nie można wyciszać użytkowników na tej witrynie."
#: actions/silence.php:72
msgid "User is already silenced."
@@ -3228,201 +3674,147 @@ msgstr "Użytkownik jest już wyciszony."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr "Podstawowe ustawienia tej strony StatusNet."
+msgstr "Podstawowe ustawienia tej witryny StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
-msgstr "Nazwa strony nie może mieć zerową długość."
+msgstr "Nazwa witryny nie może mieć zerową długość."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Należy posiadać prawidłowy kontaktowy adres e-mail."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "Nieznany język \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "Nieprawidłowy adres URL zgłaszania migawek."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Nieprawidłowa wartość wykonania migawki."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "Częstotliwość migawek musi być liczbą."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Maksymalne ograniczenie tekstu to 14 znaków."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "Ograniczenie duplikatów musi wynosić jedną lub więcej sekund."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Ogólne"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
-msgstr "Nazwa strony"
+msgstr "Nazwa witryny"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Nazwa strony, taka jak \"Mikroblog firmy X\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Dostarczane przez"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Tekst używany do odnośnika do zasług w stopce każdej strony"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "Adres URL \"Dostarczane przez\""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "Adres URL używany do odnośnika do zasług w stopce każdej strony"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
-msgstr "Kontaktowy adres e-mail strony"
+msgstr "Kontaktowy adres e-mail witryny"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Lokalne"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Domyślna strefa czasowa"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
-msgstr "Domyśla strefa czasowa strony, zwykle UTC."
+msgstr "Domyśla strefa czasowa witryny, zwykle UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
-msgstr "Domyślny język strony"
-
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "Adresy URL"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Serwer"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Nazwa komputera serwera strony."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Eleganckie adresu URL"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-"Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
-"adresów URL?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Dostęp"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Prywatna"
+msgstr "Domyślny język witryny"
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać stronę?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Tylko zaproszeni"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Rejestracja tylko za zaproszeniem."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Zamknięte"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Wyłączenie nowych rejestracji."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Migawki"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Losowo podczas trafienia WWW"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Jako zaplanowane zadanie"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Migawki danych"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Kiedy wysyłać dane statystyczne na serwery status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Częstotliwość"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Migawki będą wysyłane co N trafień WWW"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "Adres URL zgłaszania"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Migawki będą wysyłane na ten adres URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Ograniczenia"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Ograniczenie tekstu"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Maksymalna liczba znaków wpisów."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Ograniczenie duplikatów"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to "
"samo."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Zapisz ustawienia strony"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "Ustawienia SMS"
@@ -3526,15 +3918,26 @@ msgstr "Nie podano kodu"
msgid "You are not subscribed to that profile."
msgstr "Nie jesteÅ› subskrybowany do tego profilu."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Nie można zapisać subskrypcji."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Nie jest lokalnym użytkownikiem."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Nie ma takiego pliku."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Nie jesteÅ› subskrybowany do tego profilu."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subskrybowano"
@@ -3598,7 +4001,7 @@ msgstr "Osoby, których wpisy obserwujesz."
msgid "These are the people whose notices %s listens to."
msgstr "Osoby, których wpisy obserwuje użytkownik %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3614,19 +4017,24 @@ msgstr ""
"twittersettings%%), można automatycznie subskrybować osoby, które tam już "
"obserwujesz."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "Użytkownik %s nie obserwuje nikogo."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3655,7 +4063,8 @@ msgstr "Znacznik %s"
msgid "User profile"
msgstr "Profil użytkownika"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Zdjęcie"
@@ -3715,13 +4124,13 @@ msgstr "Brak identyfikatora profilu w żądaniu."
msgid "Unsubscribed"
msgstr "Zrezygnowano z subskrypcji"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
"Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
-"strony \"%2$s\"."
+"witryny \"%2$s\"."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
@@ -3730,86 +4139,66 @@ msgstr "Użytkownik"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr "Ustawienia użytkownika dla tej strony StatusNet."
+msgstr "Ustawienia użytkownika dla tej witryny StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Nieprawidłowe ograniczenie informacji o sobie. Musi być liczbowa."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Ograniczenie informacji o sobie"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Maksymalna długość informacji o sobie jako liczba znaków."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nowi użytkownicy"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Powitanie nowego użytkownika"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Tekst powitania nowych użytkowników (maksymalnie 255 znaków)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Domyślna subskrypcja"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Automatyczne subskrybowanie nowych użytkowników do tego użytkownika."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Zaproszenia"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Zaproszenia są włączone"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sesje"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Obsługa sesji"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Czy samodzielnie obsługiwać sesje."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Debugowanie sesji"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Włącza wyjście debugowania dla sesji."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Upoważnij subskrypcję"
@@ -3824,88 +4213,88 @@ msgstr ""
"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
"naciśnij \"Odrzuć\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licencja"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Zaakceptuj"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Subskrybuj tego użytkownika"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Odrzuć"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Odrzuć tę subskrypcję"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Brak żądania upoważnienia."
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Upoważniono subskrypcję"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach strony, jak upoważnić subskrypcję. Token subskrypcji:"
+"Sprawdź w instrukcjach witryny, jak upoważnić subskrypcję. Token subskrypcji:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Odrzucono subskrypcjÄ™"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach strony, jak w pełni odrzucić subskrypcję."
+"Sprawdź w instrukcjach witryny, jak w pełni odrzucić subskrypcję."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "Adres URL \"%s\" jest nieprawidłowy."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Nie można odczytać adresu URL awatara \"%s\"."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"."
@@ -3925,6 +4314,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Smacznego hot-doga."
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Grupy użytkownika %1$s, strona %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Wyszukaj więcej grup"
@@ -3950,13 +4344,9 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-"Ta strona korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 "
+"Ta witryna korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 "
"StatusNet, Inc. i współtwórcy."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Współtwórcy"
@@ -4000,11 +4390,7 @@ msgstr ""
msgid "Plugins"
msgstr "Wtyczki"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nazwa"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Wersja"
@@ -4012,10 +4398,6 @@ msgstr "Wersja"
msgid "Author(s)"
msgstr "Autorzy"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Opis"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4039,19 +4421,16 @@ msgstr ""
"d bajty."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Profil grupy"
+msgstr "Dołączenie do grupy nie powiodło się."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Nie można zaktualizować grupy."
+msgstr "Nie jest częścią grupy."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Profil grupy"
+msgstr "Opuszczenie grupy nie powiodło się."
#: classes/Login_token.php:76
#, php-format
@@ -4070,27 +4449,27 @@ msgstr "Nie można wprowadzić wiadomości."
msgid "Could not update message with new URI."
msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problem podczas zapisywania wpisu. Za długi."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
"kilka minut."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4098,34 +4477,57 @@ msgstr ""
"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
"wyślij ponownie za kilka minut."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
-msgstr "Zabroniono ci wysyłania wpisów na tej stronie."
+msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Zablokowano subskrybowanie."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Już subskrybowane."
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Użytkownik zablokował cię."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Niesubskrybowane."
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Nie można usunąć autosubskrypcji."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Nie można usunąć subskrypcji."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj w %1$s, @%2$s."
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Nie można utworzyć grupy."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Nie można ustawić członkostwa w grupie."
@@ -4166,128 +4568,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Strona bez nazwy"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
-msgstr "Główna nawigacja strony"
+msgstr "Główna nawigacja witryny"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Strona domowa"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Konto"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Połącz"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Połącz z serwisami"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
-msgstr "Zmień konfigurację strony"
+msgstr "Zmień konfigurację witryny"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ZaproÅ›"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Wyloguj siÄ™"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
-msgstr "Wyloguj siÄ™ ze strony"
+msgstr "Wyloguj siÄ™ z witryny"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Utwórz konto"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
-msgstr "Zaloguj siÄ™ na stronÄ™"
+msgstr "Zaloguj siÄ™ na witrynie"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Wyszukaj"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
-msgstr "Wpis strony"
+msgstr "Wpis witryny"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokalne widoki"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Wpis strony"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
-msgstr "Druga nawigacja strony"
+msgstr "Druga nawigacja witryny"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "O usłudze"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Prywatność"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Kod źródłowy"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Odznaka"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4296,12 +4694,12 @@ msgstr ""
"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4312,37 +4710,63 @@ msgstr ""
"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
-msgstr "Licencja zawartości strony"
+msgstr "Licencja zawartości witryny"
+
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Treść i dane %1$s są prywatne i poufne."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"Prawa autorskie do treści i danych są własnością %1$s. Wszystkie prawa "
+"zastrzeżone."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
+"prawa zastrzeżone."
-#: lib/action.php:803
+#: lib/action.php:827
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licencja."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Później"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Wcześniej"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Wystąpił problem z tokenem sesji."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
-msgstr "Nie można wprowadzić zmian strony."
+msgstr "Nie można wprowadzić zmian witryny."
#: lib/adminpanelaction.php:107
msgid "Changes to that panel are not allowed."
@@ -4362,16 +4786,107 @@ msgstr "Nie można usunąć ustawienia wyglądu."
#: lib/adminpanelaction.php:312
msgid "Basic site configuration"
-msgstr "Podstawowa konfiguracja strony"
+msgstr "Podstawowa konfiguracja witryny"
#: lib/adminpanelaction.php:317
msgid "Design configuration"
msgstr "Konfiguracja wyglÄ…du"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Konfiguracja użytkownika"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Konfiguracja dostępu"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Konfiguracja ścieżek"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Konfiguracja sesji"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko "
+"do odczytu."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"Próba uwierzytelnienia API nie powiodła się, pseudonim = %1$s, pośrednik = %2"
+"$s, IP = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Zmodyfikuj aplikacjÄ™"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Ikona tej aplikacji"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Opisz aplikacjÄ™ w %d znakach"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Opisz aplikacjÄ™"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "Źródłowy adres URL"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "Adres URL strony domowej tej aplikacji"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organizacja odpowiedzialna za tÄ™ aplikacjÄ™"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "Adres URL strony domowej organizacji"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "Adres URL do przekierowania po uwierzytelnieniu"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "PrzeglÄ…darka"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Pulpit"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Typ aplikacji, przeglÄ…darka lub pulpit"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Tylko do odczytu"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Odczyt i zapis"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Unieważnij"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Załączniki"
@@ -4392,11 +4907,11 @@ msgstr "Powiadamia, kiedy pojawia się ten załącznik"
msgid "Tags for this attachment"
msgstr "Znaczniki dla tego załącznika"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Zmiana hasła nie powiodła się"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Zmiana hasła nie jest dozwolona"
@@ -4547,85 +5062,95 @@ msgstr "Błąd podczas zapisywania wpisu."
msgid "Specify the name of the user to subscribe to"
msgstr "Podaj nazwę użytkownika do subskrybowania."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Brak takiego użytkownika."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subskrybowano użytkownika %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Usunięto subskrypcję użytkownika %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Nie zaimplementowano polecenia."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Wyłączono powiadomienia."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Nie można wyłączyć powiadomień."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Włączono powiadomienia."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Polecenie logowania jest wyłączone"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie "
"minuty: %s."
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Usunięto subskrypcję użytkownika %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subskrybujesz tÄ™ osobÄ™:"
msgstr[1] "Subskrybujesz te osoby:"
msgstr[2] "Subskrybujesz te osoby:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Nikt ciÄ™ nie subskrybuje."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ta osoba ciÄ™ subskrybuje:"
msgstr[1] "Te osoby ciÄ™ subskrybujÄ…:"
msgstr[2] "Te osoby ciÄ™ subskrybujÄ…:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Jesteś członkiem tej grupy:"
msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4639,6 +5164,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4705,19 +5231,19 @@ msgstr ""
"tracks - jeszcze nie zaimplementowano\n"
"tracking - jeszcze nie zaimplementowano\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Nie odnaleziono pliku konfiguracji."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Szukano plików konfiguracji w następujących miejscach: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Należy uruchomić instalator, aby to naprawić."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Przejdź do instalatora."
@@ -4733,6 +5259,14 @@ msgstr "Aktualizacje przez komunikator"
msgid "Updates by SMS"
msgstr "Aktualizacje przez wiadomości SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Połączenia"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Upoważnione połączone aplikacje"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Błąd bazy danych"
@@ -4919,15 +5453,15 @@ msgstr "MB"
msgid "kB"
msgstr "KB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Nieznany język \"%s\"."
+msgstr "Nieznane źródło skrzynki odbiorczej %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5206,7 +5740,7 @@ msgstr ""
"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
"twoich oczu."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "z"
@@ -5322,57 +5856,55 @@ msgid "Do not share my location"
msgstr "Nie ujawniaj położenia"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Ukryj tÄ™ informacjÄ™"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Pobieranie danych geolokalizacji trwa dłużej niż powinno, proszę spróbować "
+"ponownie później"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Północ"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Południe"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "Wschód"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "Zachód"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "w"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "w rozmowie"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Powtórzone przez"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Odpowiedz"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Powtórzono wpis"
@@ -5404,11 +5936,7 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu"
msgid "Duplicate notice"
msgstr "Duplikat wpisu"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Zablokowano subskrybowanie."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Nie można wprowadzić nowej subskrypcji."
@@ -5424,19 +5952,19 @@ msgstr "Odpowiedzi"
msgid "Favorites"
msgstr "Ulubione"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Odebrane"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Wiadomości przychodzące"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Wysłane"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Wysłane wiadomości"
@@ -5513,6 +6041,11 @@ msgstr "Powtórzyć ten wpis?"
msgid "Repeat this notice"
msgstr "Powtórz ten wpis"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+"Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Ogranicz"
@@ -5523,7 +6056,7 @@ msgstr "Ogranicz tego użytkownika"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr "Przeszukaj stronÄ™"
+msgstr "Przeszukaj witrynÄ™"
#: lib/searchaction.php:126
msgid "Keyword(s)"
@@ -5539,7 +6072,7 @@ msgstr "Osoby"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr "Znajdź osoby na tej stronie"
+msgstr "Znajdź osoby na tej witrynie"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
@@ -5547,7 +6080,7 @@ msgstr "Przeszukaj zawartość wpisów"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr "Znajdź grupy na tej stronie"
+msgstr "Znajdź grupy na tej witrynie"
#: lib/section.php:89
msgid "Untitled section"
@@ -5580,34 +6113,6 @@ msgstr "Osoby subskrybowane do %s"
msgid "Groups %s is a member of"
msgstr "Grupy %s są członkiem"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Już subskrybowane."
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Użytkownik zablokował cię."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Nie można subskrybować."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Nie można subskrybować innych do ciebie."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Niesubskrybowane."
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Nie można usunąć autosubskrypcji."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Nie można usunąć subskrypcji."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5658,67 +6163,67 @@ msgstr "Zmodyfikuj awatar"
msgid "User actions"
msgstr "Czynności użytkownika"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Zmodyfikuj ustawienia profilu"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Edycja"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Wiadomość"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderuj"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "około rok temu"
@@ -5734,7 +6239,7 @@ msgstr ""
"%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków "
"szesnastkowych."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index f635266d1..e742dda19 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,17 +9,72 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:58+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:34+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Acesso"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Gravar configurações do site"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Registar"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privado"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Só por convite"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Permitir o registo só a convidados."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Fechado"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Impossibilitar registos novos."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Gravar"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Gravar configurações do site"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +89,29 @@ msgstr "Página não encontrada."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Utilizador não encontrado."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "Perfis bloqueados de %1$s, página %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -98,7 +157,7 @@ msgstr ""
"Pode tentar [dar um toque em %1$s](../%2$s) a partir do perfil ou [publicar "
"qualquer coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -111,8 +170,8 @@ msgstr ""
msgid "You and friends"
msgstr "Você e seus amigos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizações de %1$s e amigos no %2$s!"
@@ -122,23 +181,23 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método da API não encontrado."
@@ -152,7 +211,7 @@ msgstr "Método da API não encontrado."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método requer um POST."
@@ -182,8 +241,9 @@ msgstr "Não foi possível gravar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -301,11 +361,11 @@ msgstr "Não pode deixar de seguir-se a si próprio."
msgid "Two user ids or screen_names must be supplied."
msgstr "Devem ser fornecidos dois nomes de utilizador ou utilizadors."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Não foi possível determinar o utilizador de origem."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Não foi possível encontrar o utilizador de destino."
@@ -327,7 +387,8 @@ msgstr "Utilizador já é usado. Tente outro."
msgid "Not a valid nickname."
msgstr "Utilizador não é válido."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -339,7 +400,8 @@ msgstr "Página de ínicio não é uma URL válida."
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Descrição demasiado longa (máx. 140 caracteres)."
@@ -375,7 +437,7 @@ msgstr "Os sinónimos não podem ser iguais ao nome do utilizador."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Grupo não foi encontrado!"
@@ -416,6 +478,116 @@ msgstr "Grupos de %s"
msgid "groups on %s"
msgstr "Grupos em %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Tamanho inválido."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Nome de utilizador ou senha inválidos."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Erro ao configurar utilizador."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Erro na base de dados ao inserir a marca: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Envio inesperado de formulário."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Conta"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Utilizador"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Senha"
+
+#: actions/apioauthauthorize.php:328
+#, fuzzy
+msgid "Deny"
+msgstr "Estilo"
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "Todas"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Este método requer um POST ou DELETE."
@@ -445,17 +617,17 @@ msgstr "Estado apagado."
msgid "No status with that ID found."
msgstr "Não foi encontrado um estado com esse ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Não encontrado"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
@@ -469,7 +641,7 @@ msgstr "Formato não suportado."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizações preferidas por %2$s / %2$s."
@@ -480,7 +652,7 @@ msgstr "%1$s actualizações preferidas por %2$s / %2$s."
msgid "%s timeline"
msgstr "Notas de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -496,27 +668,22 @@ msgstr "%1$s / Actualizações que mencionam %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Notas públicas de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizações de todos!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Repetida por %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Repetida para %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repetências de %s"
@@ -526,7 +693,7 @@ msgstr "Repetências de %s"
msgid "Notices tagged with %s"
msgstr "Notas categorizadas com %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizações categorizadas com %1$s em %2$s!"
@@ -586,8 +753,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Antevisão"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Apagar"
@@ -599,29 +766,6 @@ msgstr "Carregar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Envio inesperado de formulário."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
@@ -660,8 +804,9 @@ msgstr ""
"subscrição por este utilizador será cancelada, ele não poderá subscrevê-lo "
"de futuro e você não receberá notificações das @-respostas dele."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Não"
@@ -669,13 +814,13 @@ msgstr "Não"
msgid "Do not block this user"
msgstr "Não bloquear este utilizador"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este utilizador"
@@ -758,7 +903,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Não foi possível apagar a confirmação do endereço electrónico."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Confirmar Endereço"
#: actions/confirmaddress.php:159
@@ -775,10 +921,57 @@ msgstr "Conversação"
msgid "Notices"
msgstr "Notas"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Precisa de iniciar sessão para editar um grupo."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Nota não tem perfil"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Não é membro deste grupo."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Ocorreu um problema com a sua sessão."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Nota não encontrada."
+
+#: actions/deleteapplication.php:149
+#, fuzzy
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
+"utilizador serão eliminados da base de dados, sem haver cópias."
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Não apagar esta nota"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Apagar esta nota"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -809,7 +1002,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?"
msgid "Do not delete this notice"
msgstr "Não apagar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Apagar esta nota"
@@ -941,16 +1134,6 @@ msgstr "Repor estilos predefinidos"
msgid "Reset back to default"
msgstr "Repor predefinição"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Gravar"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Gravar o estilo"
@@ -963,10 +1146,88 @@ msgstr "Esta nota não é uma favorita!"
msgid "Add to favorites"
msgstr "Adicionar às favoritas"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Documento não encontrado."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Outras opções"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Precisa de iniciar sessão para editar um grupo."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Nota não encontrada."
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "Use este formulário para editar o grupo."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Repita a senha acima. Obrigatório."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Utilizador já é usado. Tente outro."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Descrição"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "A URL ‘%s’ do avatar é inválida."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Localidade demasiado longa (máx. 255 caracteres)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+#, fuzzy
+msgid "Callback URL is not valid."
+msgstr "A URL ‘%s’ do avatar é inválida."
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Não foi possível actualizar o grupo."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -994,7 +1255,7 @@ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
msgid "Could not update group."
msgstr "Não foi possível actualizar o grupo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Não foi possível criar sinónimos."
@@ -1035,7 +1296,8 @@ msgstr ""
"na caixa de spam!) uma mensagem com mais instruções."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancelar"
@@ -1120,7 +1382,7 @@ msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço electrónico"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
@@ -1132,7 +1394,7 @@ msgstr "Esse já é o seu endereço electrónico."
msgid "That email address already belongs to another user."
msgstr "Esse endereço electrónico já pertence a outro utilizador."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
@@ -1194,7 +1456,7 @@ msgstr "Esta nota já é uma favorita!"
msgid "Disfavor favorite"
msgstr "Retirar das favoritas"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Notas populares"
@@ -1341,7 +1603,7 @@ msgstr "Acesso do utilizador ao grupo já foi bloqueado."
msgid "User is not a member of group."
msgstr "Utilizador não é membro do grupo."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Bloquear acesso do utilizador ao grupo"
@@ -1439,23 +1701,23 @@ msgstr "Membros do grupo %1$s, página %2$d"
msgid "A list of the users in this group."
msgstr "Uma lista dos utilizadores neste grupo."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Gestor"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Tornar utilizador o gestor do grupo"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Tornar Gestor"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Tornar este utilizador um gestor"
@@ -1635,6 +1897,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Esse não é o seu Jabber ID."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Caixa de entrada de %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1719,7 +1986,7 @@ msgstr "Mensagem pessoal"
msgid "Optionally add a personal message to the invitation."
msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1818,7 +2085,7 @@ msgstr "Nome de utilizador ou senha incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
@@ -1827,17 +2094,6 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Utilizador"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Senha"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Lembrar-me neste computador"
@@ -1869,21 +2125,21 @@ msgstr ""
"Entrar com o seu nome de utilizador e senha. Ainda não está registado? "
"[Registe](%%action.register%%) uma conta."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Só um gestor pode tornar outro utilizador num gestor."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s já é um administrador do grupo \"%2$s\"."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Não existe registo de %1$s ter entrado no grupo %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Não é possível tornar %1$s administrador do grupo %2$s."
@@ -1892,6 +2148,30 @@ msgstr "Não é possível tornar %1$s administrador do grupo %2$s."
msgid "No current status"
msgstr "Sem estado actual"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Nota não encontrada."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Tem de iniciar uma sessão para criar o grupo."
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "Use este formulário para criar um grupo novo."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Não foi possível criar sinónimos."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Grupo novo"
@@ -2004,6 +2284,51 @@ msgstr "Toque enviado"
msgid "Nudge sent!"
msgstr "Toque enviado!"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Precisa de iniciar sessão para editar um grupo."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "Outras opções"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Não é um membro desse grupo."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Nota não tem perfil"
@@ -2021,8 +2346,8 @@ msgstr "tipo de conteúdo "
msgid "Only "
msgstr "Apenas "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2035,7 +2360,8 @@ msgid "Notice Search"
msgstr "Pesquisa de Notas"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Outras Configurações"
#: actions/othersettings.php:71
@@ -2091,6 +2417,11 @@ msgstr "Chave inválida ou expirada."
msgid "Login token expired."
msgstr "Iniciar sessão no site"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Caixa de saída de %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2162,7 +2493,7 @@ msgstr "Não é possível guardar a nova senha."
msgid "Password saved."
msgstr "Senha gravada."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Localizações"
@@ -2170,132 +2501,148 @@ msgstr "Localizações"
msgid "Path and server settings for this StatusNet site."
msgstr "Configurações de localização e servidor deste site StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Sem acesso de leitura do directório do tema: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Sem acesso de escrita no directório do avatar: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Sem acesso de escrita no directório do fundo: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Sem acesso de leitura ao directório de idiomas: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Servidor"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Nome do servidor do site."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Localização"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Localização do site"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Localização de idiomas"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Localização do directório de idiomas"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "URLs bonitas"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Usar URLs bonitas (mais legíveis e memoráveis)"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Servidor do tema"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Localização do tema"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Directório do tema"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Servidor do avatar"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Localização do avatar"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Directório do avatar"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Fundos"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Servidor de fundos"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Localização dos fundos"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Directório dos fundos"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Nunca"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Às vezes"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Quando usar SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "Servidor SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Servidor para onde encaminhar pedidos SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Gravar localizações"
@@ -2359,7 +2706,7 @@ msgid "Full name"
msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página pessoal"
@@ -2382,7 +2729,7 @@ msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Localidade"
@@ -2408,7 +2755,7 @@ msgstr ""
"Categorias para si (letras, números, -, ., _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Idioma"
@@ -2434,7 +2781,7 @@ msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)
msgid "Bio is too long (max %d chars)."
msgstr "Biografia demasiado extensa (máx. %d caracteres)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Fuso horário não foi seleccionado."
@@ -2447,23 +2794,23 @@ msgstr "Idioma é demasiado extenso (máx. 50 caracteres)."
msgid "Invalid tag: \"%s\""
msgstr "Categoria inválida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Não foi possível actualizar o utilizador para subscrição automática."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Não foi possível gravar as preferências de localização."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Não foi possível gravar o perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Não foi possível gravar as categorias."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Configurações gravadas."
@@ -2485,19 +2832,19 @@ msgstr "Notas públicas, página %d"
msgid "Public timeline"
msgstr "Notas públicas"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Fonte de Notas Públicas (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Fonte de Notas Públicas (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Fonte de Notas Públicas (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2506,11 +2853,11 @@ msgstr ""
"Estas são as notas públicas do site %%site.name%% mas ninguém publicou nada "
"ainda."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Seja a primeira pessoa a publicar!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2518,7 +2865,7 @@ msgstr ""
"Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
"publicar!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2531,7 +2878,7 @@ msgstr ""
"[StatusNet](http://status.net/). [Registe-se agora](%%action.register%%) "
"para partilhar notas sobre si, família e amigos! ([Saber mais](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2569,7 +2916,7 @@ msgstr ""
"Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
"publicar uma!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Nuvem de categorias"
@@ -2713,7 +3060,7 @@ msgstr "Desculpe, código de convite inválido."
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
@@ -2756,7 +3103,7 @@ msgid "Same as password above. Required."
msgstr "Repita a senha acima. Obrigatório."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correio"
@@ -2862,7 +3209,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil noutro serviço de microblogues compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscrever"
@@ -2900,7 +3247,7 @@ msgstr "Não pode repetir a sua própria nota."
msgid "You already repeated that notice."
msgstr "Já repetiu essa nota."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetida"
@@ -2914,6 +3261,11 @@ msgstr "Repetida!"
msgid "Replies to %s"
msgstr "Respostas a %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Respostas a %1$s em %2$s!"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2961,6 +3313,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Respostas a %1$s em %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Não pode impedir notas públicas neste site."
@@ -2969,6 +3325,125 @@ msgstr "Não pode impedir notas públicas neste site."
msgid "User is already sandboxed."
msgstr "Utilizador já está impedido de criar notas públicas."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessões"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Configurações do estilo deste site StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gerir sessões"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Se devemos gerir sessões nós próprios."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Depuração de sessões"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Ligar a impressão de dados de depuração, para sessões."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Gravar configurações do site"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Precisa de iniciar uma sessão para deixar um grupo."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Nota não tem perfil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nome"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Paginação"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrição"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Autor"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Tem a certeza de que quer apagar esta nota?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Notas favoritas de %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Não foi possível importar notas favoritas."
@@ -3026,17 +3501,22 @@ msgstr "Esta é uma forma de partilhar aquilo de que gosta."
msgid "%s group"
msgstr "Grupo %s"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Membros do grupo %1$s, página %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Perfil do grupo"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Anotação"
@@ -3082,10 +3562,6 @@ msgstr "(Nenhum)"
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Estatísticas"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Criado"
@@ -3150,6 +3626,11 @@ msgstr "Avatar actualizado."
msgid " tagged %s"
msgstr " categorizou %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "Perfis bloqueados de %1$s, página %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3175,12 +3656,12 @@ msgstr "Fonte de notas para %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF para %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3188,7 +3669,7 @@ msgstr ""
"Viu algo de interessante ultimamente? Como ainda não publicou nenhuma nota, "
"esta seria uma óptima altura para começar :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3197,7 +3678,7 @@ msgstr ""
"Pode tentar dar um toque em %1$s ou [publicar algo à sua atenção](%%%%action."
"newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3211,7 +3692,7 @@ msgstr ""
"register%%) para seguir as notas de **%s** e de muitos mais! ([Saber mais](%%"
"doc.help%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3222,7 +3703,7 @@ msgstr ""
"(http://en.wikipedia.org/wiki/Micro-blogging) baseado no programa de "
"Software Livre [StatusNet](http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Repetência de %s"
@@ -3239,197 +3720,145 @@ msgstr "O utilizador já está silenciado."
msgid "Basic settings for this StatusNet site."
msgstr "Configurações básicas para este site StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Nome do site não pode ter comprimento zero."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Tem de ter um endereço válido para o correio electrónico de contacto."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "Língua desconhecida \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "URL para onde enviar instantâneos é inválida"
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Valor de criação do instantâneo é inválido."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "Frequência dos instantâneos estatísticos tem de ser um número."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "O valor mínimo de limite para o texto é 140 caracteres."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "O limite de duplicados tem de ser 1 ou mais segundos."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Geral"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Nome do site"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "O nome do seu site, por exemplo \"Microblogue NomeDaEmpresa\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Disponibilizado por"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Texto usado para a ligação de atribuição no rodapé de cada página"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URL da atribuição"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL usada para a ligação de atribuição no rodapé de cada página"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Endereço de correio electrónico de contacto para o site"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Local"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Fuso horário, por omissão"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horário por omissão, para o site; normalmente, UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Idioma do site, por omissão"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URLs"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Servidor"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Nome do servidor do site."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "URLs bonitas"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Usar URLs bonitas (mais legíveis e memoráveis)"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Acesso"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Privado"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Só por convite"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Permitir o registo só a convidados."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Fechado"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Impossibilitar registos novos."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Instantâneos"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Aleatoriamente, durante o acesso pela internet"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Num processo agendado"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Instantâneos dos dados"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Quando enviar dados estatísticos para os servidores do status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frequência"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Instantâneos serão enviados uma vez a cada N acessos da internet"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL para relatórios"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Instantâneos serão enviados para esta URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limites"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Limite de texto"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Número máximo de caracteres nas notas."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Limite de duplicações"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a "
"mesma coisa outra vez."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Gravar configurações do site"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "Configurações de SMS"
@@ -3534,15 +3963,26 @@ msgstr "Nenhum código introduzido"
msgid "You are not subscribed to that profile."
msgstr "Não subscreveu esse perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Não foi possível gravar a subscrição."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "O utilizador não é local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ficheiro não foi encontrado."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Não subscreveu esse perfil."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscrito"
@@ -3606,7 +4046,7 @@ msgstr "Estas são as pessoas cujas notas está a escutar."
msgid "These are the people whose notices %s listens to."
msgstr "Estas são as pessoas cujas notas %s está a escutar."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3622,19 +4062,24 @@ msgstr ""
"twittersettings%%) pode subscrever automaticamente as pessoas que já segue "
"lá."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s não está a ouvir ninguém."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3663,7 +4108,8 @@ msgstr "Categoria %s"
msgid "User profile"
msgstr "Perfil"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3722,7 +4168,7 @@ msgstr "O pedido não tem a identificação do perfil."
msgid "Unsubscribed"
msgstr "Subscrição cancelada"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3739,84 +4185,64 @@ msgstr "Utilizador"
msgid "User settings for this StatusNet site."
msgstr "Configurações do utilizador para este site StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite da biografia inválido. Tem de ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Limite da Biografia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Tamanho máximo de uma biografia em caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Utilizadores novos"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Boas-vindas a utilizadores novos"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Subscrição predefinida"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Novos utilizadores subscrevem automaticamente este utilizador."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Convites"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Convites habilitados"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessões"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Gerir sessões"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Se devemos gerir sessões nós próprios."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Depuração de sessões"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Ligar a impressão de dados de depuração, para sessões."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar subscrição"
@@ -3831,36 +4257,36 @@ msgstr ""
"subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
"as notas de alguém, simplesmente clique \"Rejeitar\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licença"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Aceitar"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Subscrever este utilizador"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Rejeitar"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Rejeitar esta subscrição"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Não há pedido de autorização!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Subscrição autorizada"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3870,11 +4296,11 @@ msgstr ""
"Verifique as instruções do site para saber como autorizar a subscrição. A "
"sua chave de subscrição é:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Subscrição rejeitada"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3884,37 +4310,37 @@ msgstr ""
"Verifique as instruções do site para saber como rejeitar completamente a "
"subscrição."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "A listener URI ‘%s’ não foi encontrada aqui."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "URI do escutado ‘%s’ é demasiado longo."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "URI do ouvido ‘%s’ é um utilizador local."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "A URL ‘%s’ do perfil é de um utilizador local."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "A URL ‘%s’ do avatar é inválida."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Não é possível ler a URL do avatar ‘%s’."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’."
@@ -3935,6 +4361,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Disfrute do seu cachorro-quente!"
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Membros do grupo %1$s, página %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Procurar mais grupos"
@@ -3963,10 +4394,6 @@ msgstr ""
"Este site utiliza o %1$s versão %2$s, (c) 2008-2010 StatusNet, Inc. e "
"colaboradores."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Colaboradores"
@@ -4007,11 +4434,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugins"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nome"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versão"
@@ -4019,10 +4442,6 @@ msgstr "Versão"
msgid "Author(s)"
msgstr "Autores"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descrição"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4075,27 +4494,27 @@ msgstr "Não foi possível inserir a mensagem."
msgid "Could not update message with new URI."
msgstr "Não foi possível actualizar a mensagem com a nova URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erro na base de dados ao inserir a marca: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problema na gravação da nota. Demasiado longa."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema na gravação da nota. Utilizador desconhecido."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a "
"alguns minutos."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4103,34 +4522,58 @@ msgstr ""
"Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
"publicar daqui a alguns minutos."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Está proibido de publicar notas neste site."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Foi bloqueado de fazer subscrições"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Já subscrito!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "O utilizador bloqueou-o."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Não subscrito!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Não foi possível apagar a auto-subscrição."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Não foi possível apagar a subscrição."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Não foi possível configurar membros do grupo."
@@ -4171,128 +4614,124 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Início"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Conta"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Ligar"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Ligar aos serviços"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Terminar esta sessão"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Criar uma conta"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Pesquisa"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Aviso do site"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistas locais"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Aviso da página"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Sobre"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "Termos"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Código"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Emblema"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4301,12 +4740,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogues. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4317,33 +4756,55 @@ msgstr ""
"disponibilizado nos termos da [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licença de conteúdos do site"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "Tudo "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licença."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Posteriores"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Anteriores"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Ocorreu um problema com a sua sessão."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4373,10 +4834,104 @@ msgstr "Configuração básica do site"
msgid "Design configuration"
msgstr "Configuração do estilo"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Configuração das localizações"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Configuração do estilo"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Configuração das localizações"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Configuração do estilo"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Descreva o grupo ou o assunto em %d caracteres"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Descreva o grupo ou assunto"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Código"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL da página ou do blogue, deste grupo ou assunto"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL da página ou do blogue, deste grupo ou assunto"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Remover"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Anexos"
@@ -4397,11 +4952,11 @@ msgstr "Notas em que este anexo aparece"
msgid "Tags for this attachment"
msgstr "Categorias para este anexo"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Não foi possível mudar a palavra-chave"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Não é permitido mudar a palavra-chave"
@@ -4552,82 +5107,93 @@ msgstr "Erro ao gravar nota."
msgid "Specify the name of the user to subscribe to"
msgstr "Introduza o nome do utilizador para subscrever"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Utilizador não encontrado."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscreveu %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Introduza o nome do utilizador para deixar de subscrever"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Deixou de subscrever %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comando ainda não implementado."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Não foi possível desligar a notificação."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Não foi possível ligar a notificação."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Comando para iniciar sessão foi desactivado"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
"s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Deixou de subscrever %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subscreveu esta pessoa:"
msgstr[1] "Subscreveu estas pessoas:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa subscreve as suas notas:"
msgstr[1] "Estas pessoas subscrevem as suas notas:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4641,6 +5207,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4705,19 +5272,19 @@ msgstr ""
"tracks - ainda não implementado.\n"
"tracking - ainda não implementado.\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ficheiro de configuração não encontrado. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Talvez queira correr o instalador para resolver esta questão."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -4733,6 +5300,15 @@ msgstr "Actualizações por mensagem instantânea (MI)"
msgid "Updates by SMS"
msgstr "Actualizações por SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Ligar"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Erro de base de dados"
@@ -4918,12 +5494,12 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "Língua desconhecida \"%s\"."
@@ -5204,7 +5780,7 @@ msgstr ""
"conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
"só você terá acesso."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5324,57 +5900,53 @@ msgid "Do not share my location"
msgstr "Não partilhar a minha localização."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Ocultar esta informação"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "coords."
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder a esta nota"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Nota repetida"
@@ -5406,11 +5978,7 @@ msgstr "Erro ao inserir perfil remoto"
msgid "Duplicate notice"
msgstr "Nota duplicada"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Foi bloqueado de fazer subscrições"
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir nova subscrição."
@@ -5426,19 +5994,19 @@ msgstr "Respostas"
msgid "Favorites"
msgstr "Favoritas"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Recebidas"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Mensagens recebidas"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Enviadas"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Mensagens enviadas"
@@ -5515,6 +6083,10 @@ msgstr "Repetir esta nota?"
msgid "Repeat this notice"
msgstr "Repetir esta nota"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Bloquear notas públicas"
@@ -5582,34 +6154,6 @@ msgstr "Pessoas que subscrevem %s"
msgid "Groups %s is a member of"
msgstr "Grupos de que %s é membro"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Já subscrito!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "O utilizador bloqueou-o."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Não foi possível subscrever."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Não foi possível que outro o subscrevesse."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Não subscrito!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Não foi possível apagar a auto-subscrição."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Não foi possível apagar a subscrição."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5660,67 +6204,67 @@ msgstr "Editar Avatar"
msgid "User actions"
msgstr "Acções do utilizador"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Editar configurações do perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar mensagem directa a este utilizador"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Mensagem"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "há cerca de um ano"
@@ -5734,7 +6278,7 @@ msgstr "%s não é uma cor válida!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index cd0bdedd7..18659cecf 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: Aracnus
# Author@translatewiki.net: Ewout
+# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Vuln
# --
# This file is distributed under the same license as the StatusNet package.
@@ -10,17 +11,69 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:02+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:37+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Acesso"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Configurações de acesso ao site"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registro"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Particular"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Somente convidados"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Cadastro liberado somente para convidados."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Fechado"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Desabilita novos registros."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salvar"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Salvar as configurações de acesso"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +88,29 @@ msgstr "Esta página não existe."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Este usuário não existe."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s e amigos, pág. %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,16 +149,16 @@ msgstr ""
"publicar algo."
#: actions/all.php:134
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Você pode tentar [chamar a atenção de %s](../%s) em seu perfil ou [publicar "
-"alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?"
-"status_textarea=%s)."
+"Você pode tentar [chamar a atenção de %1$s](../%2$s) em seu perfil ou "
+"[publicar alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?"
+"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -114,8 +171,8 @@ msgstr ""
msgid "You and friends"
msgstr "Você e amigos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Atualizações de %1$s e amigos no %2$s!"
@@ -125,23 +182,23 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "O método da API não foi encontrado!"
@@ -155,7 +212,7 @@ msgstr "O método da API não foi encontrado!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Este método requer um POST."
@@ -186,8 +243,9 @@ msgstr "Não foi possível salvar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -269,7 +327,6 @@ msgid "No status found with that ID."
msgstr "Não foi encontrado nenhum status com esse ID."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
msgstr "Esta mensagem já é favorita!"
@@ -278,7 +335,6 @@ msgid "Could not create favorite."
msgstr "Não foi possível criar a favorita."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
msgstr "Essa mensagem não é favorita!"
@@ -300,7 +356,6 @@ msgid "Could not unfollow user: User not found."
msgstr "Não é possível deixar de seguir o usuário: Usuário não encontrado."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
msgstr "Você não pode deixar de seguir você mesmo!"
@@ -308,11 +363,11 @@ msgstr "Você não pode deixar de seguir você mesmo!"
msgid "Two user ids or screen_names must be supplied."
msgstr "Duas IDs de usuário ou screen_names devem ser informados."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Não foi possível determinar o usuário de origem."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Não foi possível encontrar usuário de destino."
@@ -336,7 +391,8 @@ msgstr "Esta identificação já está em uso. Tente outro."
msgid "Not a valid nickname."
msgstr "Não é uma identificação válida."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -348,7 +404,8 @@ msgstr "A URL informada não é válida."
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo muito extenso (máx. 255 caracteres)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Descrição muito extensa (máximo %d caracteres)."
@@ -384,7 +441,7 @@ msgstr "O apelido não pode ser igual à identificação."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "O grupo não foi encontrado!"
@@ -397,18 +454,18 @@ msgid "You have been blocked from that group by the admin."
msgstr "O administrador desse grupo bloqueou sua inscrição."
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Não foi possível associar o usuário %s ao grupo %s."
+msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr "Você não é membro deste grupo."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Não foi possível remover o usuário %s do grupo %s."
+msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -425,6 +482,119 @@ msgstr "Grupos de %s"
msgid "groups on %s"
msgstr "grupos no %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Não foi fornecido nenhum parâmetro oauth_token"
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Token inválido."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Nome de usuário e/ou senha inválido(s)!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+"Erro no banco de dados durante a exclusão do usuário da aplicação OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"O token de requisição %s foi autorizado. Por favor, troque-o por um token de "
+"acesso."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "O token %s solicitado foi negado e revogado."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Submissão inesperada de formulário."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Uma aplicação gostaria de se conectar à sua conta"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Permitir ou negar o acesso"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"A aplicação <strong>%1$s</strong> por <strong>%2$s</strong> solicita a "
+"permissão para <strong>%3$s</strong> os dados da sua conta %4$s. Você deve "
+"fornecer acesso à sua conta %4$s somente para terceiros nos quais você "
+"confia."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Conta"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Usuário"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Senha"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Negar"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Permitir"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Permitir ou negar o acesso às informações da sua conta."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Esse método requer um POST ou DELETE."
@@ -454,17 +624,17 @@ msgstr "A mensagem foi excluída."
msgid "No status with that ID found."
msgstr "Não foi encontrada nenhuma mensagem com esse ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Está muito extenso. O tamanho máximo é de %s caracteres."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Não encontrado"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "O tamanho máximo da mensagem é de %s caracteres"
@@ -474,14 +644,14 @@ msgid "Unsupported format."
msgstr "Formato não suportado."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favoritas de %s"
+msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:117
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s marcadas como favoritas por %s / %s."
+msgstr "%1$s marcadas como favoritas por %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -489,7 +659,7 @@ msgstr "%s marcadas como favoritas por %s / %s."
msgid "%s timeline"
msgstr "Mensagens de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -505,27 +675,22 @@ msgstr "%1$s / Mensagens mencionando %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Mensagens públicas de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s mensagens de todo mundo!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Repetida por %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Repetida para %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repetições de %s"
@@ -535,7 +700,7 @@ msgstr "Repetições de %s"
msgid "Notices tagged with %s"
msgstr "Mensagens etiquetadas como %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mensagens etiquetadas como %1$s no %2$s!"
@@ -596,8 +761,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Visualização"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Excluir"
@@ -609,30 +774,6 @@ msgstr "Enviar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Submissão inesperada de formulário."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
@@ -672,8 +813,9 @@ msgstr ""
"nenhuma notificação acerca de qualquer citação (@usuário) que ele fizer de "
"você."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Não"
@@ -681,13 +823,13 @@ msgstr "Não"
msgid "Do not block this user"
msgstr "Não bloquear este usuário"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuário"
@@ -711,9 +853,9 @@ msgid "%s blocked profiles"
msgstr "Perfis bloqueados no %s"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "Perfis bloqueados no %s, página %d"
+msgstr "Perfis bloqueados no %1$s, pág. %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -770,7 +912,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Não foi possível excluir a confirmação de e-mail."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Confirme o endereço"
#: actions/confirmaddress.php:159
@@ -787,10 +929,51 @@ msgstr "Conversa"
msgid "Notices"
msgstr "Mensagens"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Você precisa estar autenticado para excluir uma aplicação."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "A aplicação não foi encontrada."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Você não é o dono desta aplicação."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Ocorreu um problema com o seu token de sessão."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Excluir a aplicação"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Tem certeza que deseja excluir esta aplicação? Isso eliminará todos os dados "
+"desta aplicação do banco de dados, incluindo todas as conexões existentes "
+"com os usuários."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Não excluir esta aplicação"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Excluir esta aplicação"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -821,7 +1004,7 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
msgid "Do not delete this notice"
msgstr "Não excluir esta mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -842,8 +1025,8 @@ msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
-"Tem certeza que deseja excluir este usuário? Isso irá eliminar todos os "
-"dados deste usuário do banco de dados, sem cópia de segurança."
+"Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados "
+"deste usuário do banco de dados, sem cópia de segurança."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
msgid "Delete this user"
@@ -953,16 +1136,6 @@ msgstr "Restaura a aparência padrão"
msgid "Reset back to default"
msgstr "Restaura de volta ao padrão"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Salvar"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Salvar a aparência"
@@ -975,9 +1148,75 @@ msgstr "Esta mensagem não é uma favorita!"
msgid "Add to favorites"
msgstr "Adicionar às favoritas"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Esse documento não existe."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "O documento \"%s\" não existe"
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Editar a aplicação"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Você precisa estar autenticado para editar uma aplicação."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Essa aplicação não existe."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Use este formulário para editar a sua aplicação."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "O nome é obrigatório."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "O nome é muito extenso (máx. 255 caracteres)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Este nome já está em uso. Tente outro."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "A descrição é obrigatória."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "A URL da fonte é muito extensa."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "A URL da fonte não é válida."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "A organização é obrigatória."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "A organização é muito extensa (máx. 255 caracteres)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "O site da organização é obrigatório."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "O retorno é muito extenso."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "A URL de retorno não é válida."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Não foi possível atualizar a aplicação."
#: actions/editgroup.php:56
#, php-format
@@ -990,9 +1229,8 @@ msgstr "Você deve estar autenticado para criar um grupo."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "Você deve ser o administrador do grupo para editá-lo"
+msgstr "Você deve ser um administrador para editar o grupo."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -1007,7 +1245,7 @@ msgstr "descrição muito extensa (máximo %d caracteres)."
msgid "Could not update group."
msgstr "Não foi possível atualizar o grupo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Não foi possível criar os apelidos."
@@ -1016,7 +1254,6 @@ msgid "Options saved."
msgstr "As configurações foram salvas."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "Configurações do e-mail"
@@ -1049,14 +1286,14 @@ msgstr ""
"de spam!) por uma mensagem com mais instruções."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Cancelar"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "Endereços de e-mail"
+msgstr "Endereço de e-mail"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1134,7 +1371,7 @@ msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
@@ -1146,7 +1383,7 @@ msgstr "Esse já é seu endereço de e-mail."
msgid "That email address already belongs to another user."
msgstr "Esse endereço de e-mail já pertence à outro usuário."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
@@ -1209,7 +1446,7 @@ msgstr "Essa mensagem já é uma favorita!"
msgid "Disfavor favorite"
msgstr "Desmarcar a favorita"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Mensagens populares"
@@ -1357,19 +1594,19 @@ msgstr "O usuário já está bloqueado no grupo."
msgid "User is not a member of group."
msgstr "O usuário não é um membro do grupo"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Bloquear o usuário no grupo"
#: actions/groupblock.php:162
-#, fuzzy, php-format
+#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
-"Tem certeza que deseja bloquear o usuário \"%s\" no grupo \"%s\"? Ele será "
-"removido do grupo e impossibilitado de publicar e de se juntar ao grupo "
+"Tem certeza que deseja bloquear o usuário \"%1$s\" no grupo \"%2$s\"? Ele "
+"será removido do grupo e impossibilitado de publicar e de se juntar ao grupo "
"futuramente."
#: actions/groupblock.php:178
@@ -1427,7 +1664,6 @@ msgstr ""
"arquivo é %s."
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
msgstr "Usuário sem um perfil correspondente"
@@ -1449,31 +1685,31 @@ msgid "%s group members"
msgstr "Membros do grupo %s"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "Membros do grupo %s, pág. %d"
+msgstr "Membros do grupo %1$s, pág. %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "Uma lista dos usuários deste grupo."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Tornar o usuário um administrador do grupo"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Tornar administrador"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Torna este usuário um administrador"
@@ -1560,7 +1796,6 @@ msgid "Error removing the block."
msgstr "Erro na remoção do bloqueio."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "Configurações do MI"
@@ -1592,7 +1827,6 @@ msgstr ""
"contatos?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "Endereço do MI"
@@ -1657,6 +1891,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Essa não é sua ID do Jabber."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Recebidas por %s - pág. %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1740,7 +1979,7 @@ msgstr "Mensagem pessoal"
msgid "Optionally add a personal message to the invitation."
msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1811,9 +2050,9 @@ msgid "You must be logged in to join a group."
msgstr "Você deve estar autenticado para se associar a um grupo."
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s associou-se ao grupo %s"
+msgstr "%1$s associou-se ao grupo %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -1824,9 +2063,9 @@ msgid "You are not a member of that group."
msgstr "Você não é um membro desse grupo."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s deixou o grupo %s"
+msgstr "%1$s deixou o grupo %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1841,7 +2080,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erro na configuração do usuário. Você provavelmente não tem autorização."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
@@ -1850,17 +2089,6 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Usuário"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Senha"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Lembrar neste computador"
@@ -1892,31 +2120,51 @@ msgstr ""
"Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%"
"%action.register%%) uma nova conta."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
"Somente um administrador pode dar privilégios de administração para outro "
"usuário."
-#: actions/makeadmin.php:95
-#, fuzzy, php-format
+#: actions/makeadmin.php:96
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s já é um administrador do grupo \"%s\"."
+msgstr "%1$s já é um administrador do grupo \"%2$s\"."
-#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#: actions/makeadmin.php:133
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Não foi possível obter o registro de membro de %s no grupo %s"
+msgstr "Não foi possível obter o registro de membro de %1$s no grupo %2$s."
-#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#: actions/makeadmin.php:146
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Não foi possível tornar %s um administrador do grupo %s"
+msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "Nenhuma mensagem atual"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nova aplicação"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Você deve estar autenticado para registrar uma aplicação."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Utilize este formulário para registrar uma nova aplicação."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "A URL da fonte é obrigatória."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Não foi possível criar a aplicação."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Novo grupo"
@@ -1954,9 +2202,9 @@ msgid "Message sent"
msgstr "A mensagem foi enviada"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "A mensagem direta para %s foi enviada"
+msgstr "A mensagem direta para %s foi enviada."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1984,9 +2232,9 @@ msgid "Text search"
msgstr "Procurar por texto"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Resultados da procura por \"%s\" no %s"
+msgstr "Resultados da procura para \"%1$s\" no %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -2032,6 +2280,50 @@ msgstr "A chamada de atenção foi enviada"
msgid "Nudge sent!"
msgstr "A chamada de atenção foi enviada!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Você precisa estar autenticado para listar suas aplicações."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Aplicações OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Aplicações que você registrou"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Você ainda não registrou nenhuma aplicação."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Aplicações conectadas"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Você permitiu que as seguintes aplicações acessem a sua conta."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Você não é um usuário dessa aplicação."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Não foi possível revogar o acesso para a aplicação: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Você não autorizou nenhuma aplicação a usar a sua conta."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Os desenvolvedores podem editar as configurações de registro para suas "
+"aplicações "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "A mensagem não está associada a nenhum perfil"
@@ -2049,8 +2341,8 @@ msgstr "tipo de conteúdo "
msgid "Only "
msgstr "Apenas "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -2063,7 +2355,7 @@ msgid "Notice Search"
msgstr "Procurar mensagens"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Outras configurações"
#: actions/othersettings.php:71
@@ -2095,29 +2387,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Não foi especificado nenhum grupo."
+msgstr "Não foi especificado nenhum ID de usuário."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Não foi especificada nenhuma mensagem."
+msgstr "Não foi especificado nenhum token de autenticação."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Nenhuma ID de perfil na requisição."
+msgstr "Não foi requerido nenhum token de autenticação."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Token inválido ou expirado."
+msgstr "O token de autenticação especificado é inválido."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Autenticar-se no site"
+msgstr "O token de autenticação expirou."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Enviadas por %s - pág. %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2191,7 +2483,7 @@ msgstr "Não é possível salvar a nova senha."
msgid "Password saved."
msgstr "A senha foi salva."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Caminhos"
@@ -2199,134 +2491,149 @@ msgstr "Caminhos"
msgid "Path and server settings for this StatusNet site."
msgstr "Configurações dos caminhos e do servidor para este site StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Sem permissão de leitura no diretório de temas: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Sem permissão de escrita no diretório de avatares: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Sem permissão de leitura no diretório de locales: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
"Servidor SSL inválido. O comprimento máximo deve ser de 255 caracteres."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Servidor"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Nome de host do servidor do site."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Caminho"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Caminho do site"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Caminho para os locales"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Caminho do diretório de locales"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "URLs limpas"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Servidor de temas"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Caminho dos temas"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Diretório dos temas"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Servidor de avatares"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Caminho dos avatares"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Diretório dos avatares"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Imagens de fundo"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Servidor de imagens de fundo"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Caminho das imagens de fundo"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Diretório das imagens de fundo"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Nunca"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Algumas vezes"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Quando usar SSL"
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "Servidor SSL"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Servidor para onde devem ser direcionadas as requisições SSL"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Salvar caminhos"
@@ -2349,19 +2656,19 @@ msgid "Not a valid people tag: %s"
msgstr "Não é uma etiqueta de pessoa válida: %s"
#: actions/peopletag.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Usuários auto-etiquetados com %s - pág. %d"
+msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
msgstr "O conteúdo da mensagem é inválido"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"A licença ‘%s’ da mensagem não é compatível com a licença ‘%s’ do site."
+"A licença ‘%1$s’ da mensagem não é compatível com a licença ‘%2$s’ do site."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2389,7 +2696,7 @@ msgid "Full name"
msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site"
@@ -2412,7 +2719,7 @@ msgstr "Descrição"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Localização"
@@ -2438,7 +2745,7 @@ msgstr ""
"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Idioma"
@@ -2465,7 +2772,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "A descrição é muito extensa (máximo %d caracteres)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "O fuso horário não foi selecionado."
@@ -2478,23 +2785,23 @@ msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Não foi possível salvar as preferências de localização."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Não foi possível salvar o perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Não foi possível salvar as etiquetas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "As configurações foram salvas."
@@ -2516,19 +2823,19 @@ msgstr "Mensagens públicas, pág. %d"
msgid "Public timeline"
msgstr "Mensagens públicas"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Fonte de mensagens públicas (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Fonte de mensagens públicas (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Fonte de mensagens públicas (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2537,11 +2844,11 @@ msgstr ""
"Esse é o fluxo de mensagens públicas de %%site.name%%, mas ninguém publicou "
"nada ainda."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Seja o primeiro a publicar!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2549,7 +2856,7 @@ msgstr ""
"Por que você não [registra uma conta](%%action.register%%) pra ser o "
"primeiro a publicar?"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2562,7 +2869,7 @@ msgstr ""
"[Cadastre-se agora](%%action.register%%) para compartilhar notícias sobre "
"você com seus amigos, família e colegas! ([Saiba mais](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2600,7 +2907,7 @@ msgstr ""
"Por que você não [registra uma conta](%%action.register%%) pra ser o "
"primeiro a publicar?"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Nuvem de etiquetas"
@@ -2745,7 +3052,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -2788,7 +3095,7 @@ msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2817,7 +3124,7 @@ msgstr ""
"e número de telefone."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2834,10 +3141,10 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Parabéns, %s! E bem-vindo(a) a %%%%site.name%%%%. A partir daqui, você "
+"Parabéns, %1$s! E bem-vindo(a) a %%%%site.name%%%%. A partir daqui, você "
"pode...\n"
"\n"
-"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n"
+"* Acessar [seu perfil](%2$s) e publicar sua primeira mensagem.\n"
"* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para "
"que você possa publicar via mensagens instantâneas.\n"
"* [Procurar pessoas](%%%%action.peoplesearch%%%%) que você conheça ou que "
@@ -2894,7 +3201,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil em outro serviço de microblog compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Assinar"
@@ -2931,7 +3238,7 @@ msgstr "Você não pode repetir sua própria mensagem."
msgid "You already repeated that notice."
msgstr "Você já repetiu essa mensagem."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetida"
@@ -2945,6 +3252,11 @@ msgstr "Repetida!"
msgid "Replies to %s"
msgstr "Respostas para %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Respostas para %1$s, pág. %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2961,13 +3273,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "Fonte de respostas para %s (Atom)"
#: actions/replies.php:198
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
-"Esse é o fluxo de mensagens de resposta para %s, mas %s ainda não recebeu "
-"nenhuma mensagem direcionada a ele(a)."
+"Esse é o fluxo de mensagens de resposta para %1$s, mas %2$s ainda não "
+"recebeu nenhuma mensagem direcionada a ele(a)."
#: actions/replies.php:203
#, php-format
@@ -2979,19 +3291,24 @@ msgstr ""
"pessoas ou [associe-se a grupos](%%action.groups%%)."
#: actions/replies.php:205
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Você pode tentar [chamar a atenção de %s](../%s) ou [publicar alguma coisa "
-"que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Você pode tentar [chamar a atenção de %1$s](../%2$s) ou [publicar alguma "
+"coisa que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%3"
+"$s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
msgstr "Respostas para %1$s no %2$s"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Você não pode colocar usuários deste site em isolamento."
@@ -3000,6 +3317,121 @@ msgstr "Você não pode colocar usuários deste site em isolamento."
msgid "User is already sandboxed."
msgstr "O usuário já está em isolamento."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessões"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Configurações da sessão deste site StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Gerenciar sessões"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Define se nós cuidamos do gerenciamento das sessões."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Depuração da sessão"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Ativa a saída de depuração para as sessões."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Salvar as configurações do site"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Você deve estar autenticado para visualizar uma aplicação."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Perfil da aplicação"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Ãcone"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Nome"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organização"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrição"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Criado por %1$s - acesso %2$s por padrão - %3$d usuários"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Ações da aplicação"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Restaurar a chave e o segredo"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Informação da aplicação"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Chave do consumidor"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Segredo do consumidor"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL do token de requisição"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL do token de acesso"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Autorizar a URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de "
+"assinatura em texto plano."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Tem certeza que deseja restaurar sua chave e segredo de consumidor?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Mensagens favoritas de %1$s, pág. %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Não foi possível recuperar as mensagens favoritas."
@@ -3057,17 +3489,22 @@ msgstr "Esta é uma forma de compartilhar o que você gosta."
msgid "%s group"
msgstr "Grupo %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Grupo %1$s, pág. %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Perfil do grupo"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "Site"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Mensagem"
@@ -3113,10 +3550,6 @@ msgstr "(Nenhum)"
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Estatísticas"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Criado"
@@ -3181,10 +3614,15 @@ msgstr "A mensagem excluída."
msgid " tagged %s"
msgstr " etiquetada %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, pág. %2$d"
+
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Fonte de mensagens de %s etiquetada %s (RSS 1.0)"
+msgstr "Fonte de mensagens de %1$s etiquetada como %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
@@ -3206,13 +3644,14 @@ msgstr "Fonte de mensagens de %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF de %s"
-#: actions/showstream.php:191
-#, fuzzy, php-format
+#: actions/showstream.php:200
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-"Este é o fluxo público de mensagens de %s, mas %s não publicou nada ainda."
+"Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada "
+"ainda."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3220,16 +3659,16 @@ msgstr ""
"Viu alguma coisa interessante recentemente? Você ainda não publicou nenhuma "
"mensagem. Que tal começar agora? :)"
-#: actions/showstream.php:198
-#, fuzzy, php-format
+#: actions/showstream.php:207
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"Você pode tentar chamar a atenção de %s ou [publicar alguma coisa que "
-"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Você pode tentar chamar a atenção de %1$s ou [publicar alguma coisa que "
+"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3243,7 +3682,7 @@ msgstr ""
"acompanhar as mensagens de **%s** e muito mais! ([Saiba mais](%%%%doc.help%%%"
"%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3254,7 +3693,7 @@ msgstr ""
"pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]"
"(http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Repetição de %s"
@@ -3271,202 +3710,148 @@ msgstr "O usuário já está silenciado."
msgid "Basic settings for this StatusNet site."
msgstr "Configurações básicas para esta instância do StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Você deve digitar alguma coisa para o nome do site."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Você deve ter um endereço de e-mail para contato válido."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Idioma desconhecido \"%s\""
+msgstr "Idioma \"%s\" desconhecido."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "A URL para o envio das estatísticas é inválida."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "O valor de execução da obtenção das estatísticas é inválido."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "A frequência de geração de estatísticas deve ser um número."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "O comprimento máximo do texto é de 140 caracteres."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "O limite de duplicatas deve ser de um ou mais segundos."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Geral"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Nome do site"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "O nome do seu site, por exemplo \"Microblog da Sua Empresa\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Disponibilizado por"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Texto utilizado para o link de créditos no rodapé de cada página"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URL do disponibilizado por"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL utilizada para o link de créditos no rodapé de cada página"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Endereço de e-mail para contatos do seu site"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Local"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Fuso horário padrão"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horário padrão para o seu site; geralmente UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Idioma padrão do site"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URLs"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Servidor"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Nome de host do servidor do site."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "URLs limpas"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Acesso"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Particular"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Somente convidados"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Cadastro liberado somente para convidados."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Fechado"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Desabilita novos registros."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Estatísticas"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Aleatoriamente durante o funcionamento"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Em horários pré-definidos"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Estatísticas dos dados"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Quando enviar dados estatísticos para os servidores status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frequentemente"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "As estatísticas serão enviadas uma vez a cada N usos da web"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL para envio"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "As estatísticas serão enviadas para esta URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Limites"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Limite do texto"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Número máximo de caracteres para as mensagens."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Limite de duplicatas"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Quanto tempo (em segundos) os usuários devem esperar para publicar a mesma "
"coisa novamente."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Salvar as configurações do site"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "Configuração de SMS"
+msgstr "Configuração do SMS"
#: actions/smssettings.php:69
#, php-format
@@ -3494,7 +3879,6 @@ msgid "Enter the code you received on your phone."
msgstr "Informe o código que você recebeu no seu telefone."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Telefone para SMS"
@@ -3567,15 +3951,26 @@ msgstr "Não foi digitado nenhum código"
msgid "You are not subscribed to that profile."
msgstr "Você não está assinando esse perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Não foi possível salvar a assinatura."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Não é um usuário local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Esse arquivo não existe."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Você não está assinando esse perfil."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Assinado"
@@ -3585,9 +3980,9 @@ msgid "%s subscribers"
msgstr "Assinantes de %s"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "Assinantes de %s, pág. %d"
+msgstr "Assinantes de %1$s, pág. %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3626,9 +4021,9 @@ msgid "%s subscriptions"
msgstr "Assinaturas de %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "Assinaturas de %s, pág. %d"
+msgstr "Assinaturas de %1$s, pág. %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -3639,7 +4034,7 @@ msgstr "Estas são as pessoas cujas mensagens você acompanha."
msgid "These are the people whose notices %s listens to."
msgstr "Estas são as pessoas cujas mensagens %s acompanha."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3655,19 +4050,24 @@ msgstr ""
"[usuário do Twitter](%%action.twittersettings%%), você pode assinar "
"automaticamente as pessoas que já segue lá."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s não está acompanhando ninguém."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3696,7 +4096,8 @@ msgstr "Etiqueta %s"
msgid "User profile"
msgstr "Perfil do usuário"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Imagem"
@@ -3755,13 +4156,13 @@ msgstr "Nenhuma ID de perfil na requisição."
msgid "Unsubscribed"
msgstr "Cancelado"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
-#, fuzzy, php-format
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
+#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"A licença '%s' do fluxo do usuário não é compatível com a licença '%s' do "
-"site."
+"A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' "
+"do site."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
@@ -3772,85 +4173,65 @@ msgstr "Usuário"
msgid "User settings for this StatusNet site."
msgstr "Configurações de usuário para este site StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite da descrição inválido. Seu valor deve ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Limite da descrição"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Comprimento máximo da descrição do perfil, em caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Novos usuários"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Boas vindas aos novos usuários"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de boas vindas para os novos usuários (máx. 255 caracteres)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Assinatura padrão"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Os novos usuários assinam esse usuário automaticamente."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Convites"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Convites habilitados"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Define se os usuários podem ou não convidar novos usuários."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessões"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Gerenciar sessões"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Define se nós cuidamos do gerenciamento das sessões."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Depuração da sessão"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Ativa a saída de depuração para as sessões."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar a assinatura"
@@ -3865,36 +4246,36 @@ msgstr ""
"as mensagens deste usuário. Se você não solicitou assinar as mensagens de "
"alguém, clique em \"Recusar\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licença"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Aceitar"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Assinar este usuário"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Recusar"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Recusar esta assinatura"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Nenhum pedido de autorização!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "A assinatura foi autorizada"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3904,11 +4285,11 @@ msgstr ""
"Verifique as instruções do site para detalhes sobre como autorizar a "
"assinatura. Seu token de assinatura é:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "A assinatura foi recusada"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3918,37 +4299,37 @@ msgstr ""
"Verifique as instruções do site para detalhes sobre como rejeitar "
"completamente a assinatura."
-#: actions/userauthorization.php:296
-#, fuzzy, php-format
+#: actions/userauthorization.php:303
+#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr "A URI ‘%s’ do usuário não foi encontrada aqui"
+msgstr "A URI ‘%s’ do usuário não foi encontrada aqui."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "A URI ‘%s’ do usuário é muito extensa."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "A URI ‘%s’ é de um usuário local."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "A URL ‘%s’ do perfil é de um usuário local."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "A URL ‘%s’ do avatar não é válida."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Não é possível ler a URL '%s' do avatar."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Tipo de imagem errado para a URL '%s' do avatar."
@@ -3969,6 +4350,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Aproveite o seu cachorro-quente!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Grupos de %1$s, pág. %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Procurar por outros grupos"
@@ -3986,9 +4372,9 @@ msgstr ""
"eles."
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "Estatísticas"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -3996,15 +4382,12 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "A mensagem foi excluída."
+"Este site funciona sobre %1$s versão %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. e colaboradores."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Colaboradores"
#: actions/version.php:168
msgid ""
@@ -4013,6 +4396,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet é um software livre: você pode redistribui-lo e/ou modificá-lo sob "
+"os termos da GNU Affero General Public License, conforme publicado pela Free "
+"Software Foundation, na versão 3 desta licença ou (caso deseje) qualquer "
+"versão posterior. "
#: actions/version.php:174
msgid ""
@@ -4021,6 +4408,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Este programa é distribuído na esperança de ser útil, mas NÃO POSSUI "
+"QUALQUER GARANTIA, nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou "
+"ADEQUAÇÃO A UMA FINALIDADE ESPECÃFICA. Verifique a GNU Affero General "
+"Public License para mais detalhes. "
#: actions/version.php:180
#, php-format
@@ -4028,29 +4419,20 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Você deve ter recebido uma cópia da GNU Affero General Public License com "
+"este programa. Caso contrário, veja %s."
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
-
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Usuário"
+msgstr "Plugins"
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "Sessões"
+msgstr "Versão"
#: actions/version.php:197
-#, fuzzy
msgid "Author(s)"
-msgstr "Autor"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descrição"
+msgstr "Autor(es)"
#: classes/File.php:144
#, php-format
@@ -4072,19 +4454,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Perfil do grupo"
+msgstr "Não foi possível se unir ao grupo."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Não foi possível atualizar o grupo."
+msgstr "Não é parte de um grupo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Perfil do grupo"
+msgstr "Não foi possível deixar o grupo."
#: classes/Login_token.php:76
#, php-format
@@ -4103,27 +4482,27 @@ msgstr "Não foi possível inserir a mensagem."
msgid "Could not update message with new URI."
msgstr "Não foi possível atualizar a mensagem com a nova URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
"novamente daqui a alguns minutos."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4131,34 +4510,57 @@ msgstr ""
"Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e "
"publique novamente daqui a alguns minutos."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Você está proibido de publicar mensagens neste site."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erro no banco de dados na inserção da reposta: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Problema no salvamento das mensagens recebidas do grupo."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Você está proibido de assinar."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Já assinado!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "O usuário bloqueou você."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Não assinado!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Não foi possível excluir a auto-assinatura."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Não foi possível excluir a assinatura."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bem vindo(a) a %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Não foi possível configurar a associação ao grupo."
@@ -4191,136 +4593,132 @@ msgid "Other options"
msgstr "Outras opções"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegação primária no site"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Início"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Conta"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Mude seu e-mail, avatar, senha, perfil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Conecte-se a outros serviços"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Mude as configurações do site"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Sai do site"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Cria uma conta"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Autentique-se no site"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Procurar"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Procura por pessoas ou textos"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Mensagem do site"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Visualizações locais"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Notícia da página"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegação secundária no site"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Sobre"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "Termos de uso"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Mini-aplicativo"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licença do software StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4329,12 +4727,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblog disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblog. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4345,42 +4743,65 @@ msgstr ""
"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licença do conteúdo do site"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
+"reservados."
+
+#: lib/action.php:827
msgid "All "
msgstr "Todas "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licença."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Anterior"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Ocorreu um problema com o seu token de sessão."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Você não pode fazer alterações neste site."
#: lib/adminpanelaction.php:107
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "Não é permitido o registro."
+msgstr "Não são permitidas alterações a esse painel."
#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
@@ -4402,10 +4823,101 @@ msgstr "Configuração básica do site"
msgid "Design configuration"
msgstr "Configuração da aparência"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Configuração do usuário"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Configuração do acesso"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Configuração dos caminhos"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Configuração das sessões"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"Os recursos de API exigem acesso de leitura e escrita, mas você possui "
+"somente acesso de leitura."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"A tentativa de autenticação na API falhou, identificação = %1$s, proxy = %2"
+"$s, ip = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Editar a aplicação"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Ãcone para esta aplicação"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Descreva a sua aplicação em %d caracteres"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Descreva sua aplicação"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL da fonte"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL do site desta aplicação"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organização responsável por esta aplicação"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL para o site da organização"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL para o redirecionamento após a autenticação"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Navegador"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Desktop"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Tipo de aplicação: navegador ou desktop"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Somente leitura"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Leitura e escrita"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Acesso padrão para esta aplicação: somente leitura ou leitura e escrita"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Revogar"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Anexos"
@@ -4426,15 +4938,13 @@ msgstr "Mensagens onde este anexo aparece"
msgid "Tags for this attachment"
msgstr "Etiquetas para este anexo"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
-#, fuzzy
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
-msgstr "Alterar a senha"
+msgstr "Não foi possível alterar a senha"
-#: lib/authenticationplugin.php:197
-#, fuzzy
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
-msgstr "Alterar a senha"
+msgstr "Não é permitido alterar a senha"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
@@ -4585,82 +5095,92 @@ msgstr "Erro no salvamento da mensagem."
msgid "Specify the name of the user to subscribe to"
msgstr "Especifique o nome do usuário que será assinado"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Este usuário não existe."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Efetuada a assinatura de %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifique o nome do usuário cuja assinatura será cancelada"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Cancelada a assinatura de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "O comando não foi implementado ainda."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Não é possível desligar a notificação."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "O comando para autenticação está desabilitado"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Este link é utilizável somente uma vez e é válido somente por dois minutos: %"
"s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Cancelada a assinatura de %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando ninguém."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Você já está assinando esta pessoa:"
msgstr[1] "Você já está assinando estas pessoas:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Ninguém o assinou ainda."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa está assinando você:"
msgstr[1] "Estas pessoas estão assinando você:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Você não é membro de nenhum grupo."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Você é membro deste grupo:"
msgstr[1] "Você é membro destes grupos:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4674,6 +5194,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4739,19 +5260,19 @@ msgstr ""
"tracks - não implementado ainda\n"
"tracking - não implementado ainda\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Não foi encontrado nenhum arquivo de configuração. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Você pode querer executar o instalador para corrigir isto."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -4767,6 +5288,14 @@ msgstr "Atualizações via mensageiro instantâneo (MI)"
msgid "Updates by SMS"
msgstr "Atualizações via SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Conexões"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Aplicações autorizadas conectadas"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Erro no banco de dados"
@@ -4953,15 +5482,15 @@ msgstr "Mb"
msgid "kB"
msgstr "Kb"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Idioma desconhecido \"%s\""
+msgstr "Fonte da caixa de entrada desconhecida %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5043,11 +5572,9 @@ msgstr ""
"Altere seu endereço de e-mail e suas opções de notificação em %8$s\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Descrição: %s\n"
-"\n"
+msgstr "Descrição: %s"
#: lib/mail.php:286
#, php-format
@@ -5240,7 +5767,7 @@ msgstr ""
"privadas para envolver outras pessoas em uma conversa. Você também pode "
"receber mensagens privadas."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5261,9 +5788,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "Desculpe-me, mas não é permitido o recebimento de e-mails."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Formato de imagem não suportado."
+msgstr "Tipo de mensagem não suportado: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
@@ -5302,18 +5829,16 @@ msgid "File upload stopped by extension."
msgstr "O arquivo a ser enviado foi barrado por causa de sua extensão."
#: lib/mediafile.php:179 lib/mediafile.php:216
-#, fuzzy
msgid "File exceeds user's quota."
-msgstr "O arquivo excede a quota do usuário!"
+msgstr "O arquivo excede a quota do usuário."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
msgstr "Não foi possível mover o arquivo para o diretório de destino."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Não foi possível determinar o mime-type do arquivo!"
+msgstr "Não foi possível determinar o tipo MIME do arquivo."
#: lib/mediafile.php:270
#, php-format
@@ -5321,7 +5846,7 @@ msgid " Try using another %s format."
msgstr " Tente usar outro formato %s."
#: lib/mediafile.php:275
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a supported file type on this server."
msgstr "%s não é um tipo de arquivo suportado neste servidor."
@@ -5355,67 +5880,63 @@ msgid "Attach a file"
msgstr "Anexar um arquivo"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Indique a sua localização"
+msgstr "Divulgar minha localização"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Indique a sua localização"
+msgstr "Não divulgar minha localização"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Desculpe, mas recuperar a sua geolocalização está demorando mais que o "
+"esperado. Por favor, tente novamente mais tarde."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "L"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "em"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder a esta mensagem"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Mensagem repetida"
@@ -5447,11 +5968,7 @@ msgstr "Erro na inserção do perfil remoto"
msgid "Duplicate notice"
msgstr "Duplicar a mensagem"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Você está proibido de assinar."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir a nova assinatura."
@@ -5467,19 +5984,19 @@ msgstr "Respostas"
msgid "Favorites"
msgstr "Favoritas"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Recebidas"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Suas mensagens recebidas"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Enviadas"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Suas mensagens enviadas"
@@ -5489,9 +6006,8 @@ msgid "Tags in %s's notices"
msgstr "Etiquetas nas mensagens de %s"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "Ação desconhecida"
+msgstr "Desconhecido"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -5557,6 +6073,10 @@ msgstr "Repetir esta mensagem?"
msgid "Repeat this notice"
msgstr "Repetir esta mensagem"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Nenhum usuário definido para o modo de usuário único."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "Isolamento"
@@ -5624,34 +6144,6 @@ msgstr "Assinantes de %s"
msgid "Groups %s is a member of"
msgstr "Grupos dos quais %s é membro"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Já assinado!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "O usuário bloqueou você."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Não foi possível assinar."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Não foi possível fazer com que outros o assinem."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Não assinado!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Não foi possível excluir a auto-assinatura."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Não foi possível excluir a assinatura."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5702,67 +6194,67 @@ msgstr "Editar o avatar"
msgid "User actions"
msgstr "Ações do usuário"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Editar as configurações do perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar uma mensagem para este usuário."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Mensagem"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
@@ -5776,8 +6268,8 @@ msgstr "%s não é uma cor válida!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
-#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#: lib/xmppmanager.php:402
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
-"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index f727147b9..d4df1a654 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,7 +1,9 @@
# Translation of StatusNet to Russian
#
# Author@translatewiki.net: Brion
+# Author@translatewiki.net: Kirill
# Author@translatewiki.net: Lockal
+# Author@translatewiki.net: Rubin
# Author@translatewiki.net: ÐлекÑандр Сигачёв
# --
# This file is distributed under the same license as the StatusNet package.
@@ -10,18 +12,71 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:06+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:41+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10< =4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "ПринÑть"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "ÐаÑтройки доÑтупа к Ñайту"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "РегиÑтрациÑ"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Личное"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Запретить анонимным (не авторизовавшимÑÑ) пользователÑм проÑматривать Ñайт?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Только по приглашениÑм"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Разрешить региÑтрацию только по приглашениÑм."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Закрыта"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Отключить новые региÑтрации."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Сохранить"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Сохранить наÑтройки доÑтупа"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -36,25 +91,29 @@ msgstr "Ðет такой Ñтраницы"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ðет такого пользователÑ."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s и друзьÑ, Ñтраница %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -100,7 +159,7 @@ msgstr ""
"что-нибудь Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -113,8 +172,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ð’Ñ‹ и друзьÑ"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Обновлено от %1$s и его друзей на %2$s!"
@@ -124,23 +183,23 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Метод API не найден."
@@ -154,7 +213,7 @@ msgstr "Метод API не найден."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Этот метод требует POST."
@@ -183,8 +242,9 @@ msgstr "Ðе удаётÑÑ Ñохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -306,11 +366,11 @@ msgstr "Ð’Ñ‹ не можете переÑтать Ñледовать за Ñоб
msgid "Two user ids or screen_names must be supplied."
msgstr "Ðадо предÑтавить два имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ кода."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Ðе удаётÑÑ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ иÑходного пользователÑ."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ целевого пользователÑ."
@@ -333,7 +393,8 @@ msgstr "Такое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ. Попробуйте
msgid "Not a valid nickname."
msgstr "Ðеверное имÑ."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -345,7 +406,8 @@ msgstr "URL Главной Ñтраницы неверен."
msgid "Full name is too long (max 255 chars)."
msgstr "Полное Ð¸Ð¼Ñ Ñлишком длинное (не больше 255 знаков)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Слишком длинное опиÑание (макÑимум %d Ñимволов)"
@@ -381,7 +443,7 @@ msgstr "ÐÐ»Ð¸Ð°Ñ Ð½Ðµ может Ñовпадать Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Группа не найдена!"
@@ -422,6 +484,115 @@ msgstr "Группы %s"
msgid "groups on %s"
msgstr "группы на %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Ðе задан параметр oauth_token."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Ðеправильный токен"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Ðеверное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль."
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Ошибка базы данных при удалении Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Ошибка базы данных при добавлении Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Ключ запроÑа %s авторизован. ПожалуйÑта, обменÑйте его на ключ доÑтупа."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñ‚Ð¾ÐºÐµÐ½Ð° %s был запрещен и аннулирован."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Ðетиповое подтверждение формы."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Приложение хочет ÑоединитьÑÑ Ñ Ð²Ð°ÑˆÐµÐ¹ учётной запиÑью"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Разрешить или запретить доÑтуп"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Приложение <strong>%1$s</strong> от <strong>%2$s</strong> проÑит разрешение "
+"на<strong>%3$s</strong> данных вашей учётной запиÑи%4$s . Ð’Ñ‹ должны "
+"предоÑтавлÑть разрешение на доÑтуп к вашей учётной запиÑи %4$s только тем "
+"Ñторонним приложениÑм, которым вы доверÑете."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "ÐаÑтройки"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "ИмÑ"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Пароль"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Запретить"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Разрешить"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Разрешить или запретить доÑтуп к информации вашей учётной запиÑи."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Этот метод требует POST или DELETE."
@@ -451,17 +622,17 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÐ´Ð°Ð»Ñ‘Ð½."
msgid "No status with that ID found."
msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° — %d знаков."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Ðе найдено"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° запиÑи — %d Ñимволов, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ URL вложениÑ."
@@ -475,7 +646,7 @@ msgstr "Ðеподдерживаемый формат."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Любимое от %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %1$s, отмеченные как любимые %2$s / %2$s."
@@ -486,7 +657,7 @@ msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %1$s, отмеченные как любимые %2
msgid "%s timeline"
msgstr "Лента %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -502,27 +673,22 @@ msgstr "%1$s / ОбновлениÑ, упоминающие %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s обновил Ñтот ответ на Ñообщение: %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %s от вÑех!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Повторено %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Повторено Ð´Ð»Ñ %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Повторы за %s"
@@ -532,7 +698,7 @@ msgstr "Повторы за %s"
msgid "Notices tagged with %s"
msgstr "ЗапиÑи Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %1$s на %2$s!"
@@ -593,8 +759,8 @@ msgstr "Оригинал"
msgid "Preview"
msgstr "ПроÑмотр"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Удалить"
@@ -606,29 +772,6 @@ msgstr "Загрузить"
msgid "Crop"
msgstr "Обрезать"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Ðетиповое подтверждение формы."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Подберите нужный квадратный учаÑток Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ аватары"
@@ -667,8 +810,9 @@ msgstr ""
"будет отпиÑан от Ð²Ð°Ñ Ð±ÐµÐ· возможноÑти подпиÑатьÑÑ Ð² будущем, а вам не будут "
"приходить ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± @-ответах от него."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Ðет"
@@ -676,13 +820,13 @@ msgstr "Ðет"
msgid "Do not block this user"
msgstr "Ðе блокировать Ñтого пользователÑ"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователÑ."
@@ -765,7 +909,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ подверждение по Ñлектронному адреÑу."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Подтвердить адреÑ"
#: actions/confirmaddress.php:159
@@ -782,10 +926,51 @@ msgstr "ДиÑкуÑÑиÑ"
msgid "Notices"
msgstr "ЗапиÑи"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Ð’Ñ‹ должны войти в ÑиÑтему, чтобы удалить приложение."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Приложение не найдено."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ владельцем Ñтого приложениÑ."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Удалить приложение"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Ð’Ñ‹ уверены, что хотите удалить Ñто приложение? Это очиÑтит вÑе данные о "
+"применении из базы данных, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²Ñе ÑущеÑтвующие Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ "
+"пользователей."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Ðе удалÑйте Ñто приложение"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Удалить Ñто приложение"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -816,7 +1001,7 @@ msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñту запиÑ
msgid "Do not delete this notice"
msgstr "Ðе удалÑть Ñту запиÑÑŒ"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Удалить Ñту запиÑÑŒ"
@@ -948,16 +1133,6 @@ msgstr "ВоÑÑтановить оформление по умолчанию"
msgid "Reset back to default"
msgstr "ВоÑÑтановить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Сохранить"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Сохранить оформление"
@@ -970,9 +1145,75 @@ msgstr "Эта запиÑÑŒ не входит в чиÑло ваших любиÐ
msgid "Add to favorites"
msgstr "Добавить в любимые"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Ðет такого документа."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Ðет такого документа «%s»"
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Изменить приложение"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы изменить приложение."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Ðет такого приложениÑ."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "ВоÑпользуйтеÑÑŒ Ñтой формой, чтобы изменить приложение."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Ð˜Ð¼Ñ Ð¾Ð±Ñзательно."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Ð˜Ð¼Ñ Ñлишком длинное (не больше 255 знаков)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Такое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ. Попробуйте какое-нибудь другое."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "ОпиÑание обÑзательно."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "URL иÑточника Ñлишком длинный."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "URL иÑточника недейÑтвителен."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "ÐžÑ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¾Ð±Ñзательна."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Слишком длинное название организации (макÑимум 255 знаков)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "ДомашнÑÑ Ñтраница организации обÑзательна."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Обратный вызов Ñлишком длинный."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "URL-Ð°Ð´Ñ€ÐµÑ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð³Ð¾ вызова недейÑтвителен."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ приложение."
#: actions/editgroup.php:56
#, php-format
@@ -1001,7 +1242,7 @@ msgstr "Слишком длинное опиÑание (макÑимум %d Ñи
msgid "Could not update group."
msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ информацию о группе."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Ðе удаётÑÑ Ñоздать алиаÑÑ‹."
@@ -1042,7 +1283,8 @@ msgstr ""
"Ð´Ð»Ñ Ñпама!), там будут дальнейшие инÑтрукции."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Отменить"
@@ -1132,7 +1374,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðе удаётÑÑ Ñтандартизировать Ñтот Ñлектронный адреÑ"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Ðеверный Ñлектронный адреÑ."
@@ -1144,7 +1386,7 @@ msgstr "Это уже Ваш Ñлектронный адреÑ."
msgid "That email address already belongs to another user."
msgstr "Этот Ñлектронный Ð°Ð´Ñ€ÐµÑ ÑƒÐ¶Ðµ задейÑтвован другим пользователем."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Ðе удаётÑÑ Ð²Ñтавить код подтверждениÑ."
@@ -1206,7 +1448,7 @@ msgstr "Эта запиÑÑŒ уже входит в чиÑло любимых!"
msgid "Disfavor favorite"
msgstr "Разлюбить"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "ПопулÑрные запиÑи"
@@ -1354,7 +1596,7 @@ msgstr "Пользователь уже заблокирован из групп
msgid "User is not a member of group."
msgstr "Пользователь не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ Ñтой группы."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы."
@@ -1452,23 +1694,23 @@ msgstr "УчаÑтники группы %1$s, Ñтраница %2$d"
msgid "A list of the users in this group."
msgstr "СпиÑок пользователей, ÑвлÑющихÑÑ Ñ‡Ð»ÐµÐ½Ð°Ð¼Ð¸ Ñтой группы."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "ÐаÑтройки"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Блокировать"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Сделать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором группы"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Сделать админиÑтратором"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Сделать Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором"
@@ -1500,7 +1742,7 @@ msgstr ""
"общими интереÑами. ПоÑле приÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº группе и вы Ñможете отправлÑть "
"ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ вÑех её учаÑтников, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ «!имÑгруппы». Ðе видите "
"группу, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð²Ð°Ñ Ð¸Ð½Ñ‚ÐµÑ€ÐµÑует? Попробуйте [найти её](%%%%action.groupsearch%"
-"%%%) или [Ñоздайте ÑобÑтвенную!](%%%%action.newgroup%%%%)"
+"%%%) или [Ñоздайте ÑобÑтвенную](%%%%action.newgroup%%%%)!"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1649,6 +1891,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Это не Ваш Jabber ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "ВходÑщие Ð´Ð»Ñ %1$s — Ñтраница %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1657,7 +1904,8 @@ msgstr "ВходÑщие Ð´Ð»Ñ %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
msgstr ""
-"Это Ваши входÑщие ÑообщениÑ, где перечиÑлены входÑщие приватные ÑообщениÑ."
+"Это ваш Ñщик входÑщих Ñообщений, в котором хранÑÑ‚ÑÑ Ð¿Ð¾Ñтупившие личные "
+"ÑообщениÑ."
#: actions/invite.php:39
msgid "Invites have been disabled."
@@ -1714,7 +1962,7 @@ msgstr ""
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
-msgstr "Ð’ Ñтой форме ты можешь приглаÑить друзей и коллег на Ñтот ÑервиÑ."
+msgstr "Ð’ Ñтой форме вы можете приглаÑить друзей и коллег на Ñтот ÑервиÑ."
#: actions/invite.php:187
msgid "Email addresses"
@@ -1722,7 +1970,7 @@ msgstr "Почтовый адреÑ"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
-msgstr "ÐдреÑа друзей, которых ты хочешь приглаÑить (по одному на Ñтрочку)"
+msgstr "ÐдреÑа друзей, которых вы хотите приглаÑить (по одному на Ñтрочку)"
#: actions/invite.php:192
msgid "Personal message"
@@ -1732,7 +1980,7 @@ msgstr "Личное Ñообщение"
msgid "Optionally add a personal message to the invitation."
msgstr "Можно добавить к приглашению личное Ñообщение."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "ОК"
@@ -1832,7 +2080,7 @@ msgstr "Ðекорректное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль."
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка уÑтановки пользователÑ. Ð’Ñ‹, вероÑтно, не авторизованы."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -1841,17 +2089,6 @@ msgstr "Вход"
msgid "Login to site"
msgstr "ÐвторизоватьÑÑ"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "ИмÑ"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Пароль"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Запомнить менÑ"
@@ -1881,22 +2118,22 @@ msgstr ""
"Вход Ñ Ð²Ð°ÑˆÐ¸Ð¼ логином и паролем. Ðет аккаунта? [ЗарегиÑтрируйте](%%action."
"register%%) новый аккаунт."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
"Только админиÑтратор может Ñделать другого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s уже ÑвлÑетÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором группы «%2$s»."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ запиÑÑŒ принадлежноÑти Ð´Ð»Ñ %1$s к группе %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Ðевозможно Ñделать %1$s админиÑтратором группы %2$s."
@@ -1905,6 +2142,26 @@ msgstr "Ðевозможно Ñделать %1$s админиÑтратором
msgid "No current status"
msgstr "Ðет текущего ÑтатуÑа"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Ðовое приложение"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы зарегиÑтрировать приложение."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "ИÑпользуйте Ñту форму Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ приложениÑ."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "URL иÑточника обÑзателен."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Ðе удаётÑÑ Ñоздать приложение."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
@@ -2017,6 +2274,48 @@ msgstr "«Подталкивание» поÑлано"
msgid "Nudge sent!"
msgstr "«Подталкивание» отправлено!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы проÑматривать Ñвои приложениÑ."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "ПриложениÑ, которые вы зарегиÑтрировали"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Ð’Ñ‹ пока не зарегиÑтрировали ни одного приложениÑ."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Подключённые приложениÑ"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Ð’Ñ‹ разрешили доÑтуп к учётной запиÑи Ñледующим приложениÑм."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ пользователем Ñтого приложениÑ."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Ðе удаётÑÑ Ð¾Ñ‚Ð¾Ð·Ð²Ð°Ñ‚ÑŒ права Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Ð’Ñ‹ не разрешили приложениÑм иÑпользовать вашу учётную запиÑÑŒ."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr "Разработчики могут изменÑть наÑтройки региÑтрации Ñвоих приложений "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "ЗапиÑÑŒ без профилÑ"
@@ -2034,8 +2333,8 @@ msgstr "тип Ñодержимого "
msgid "Only "
msgstr "Только "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ðеподдерживаемый формат данных."
@@ -2048,7 +2347,7 @@ msgid "Notice Search"
msgstr "ПоиÑк в запиÑÑÑ…"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Другие наÑтройки"
#: actions/othersettings.php:71
@@ -2080,29 +2379,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ URL Ñлишком длинный (макÑимум 50 Ñимволов)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Группа не определена."
+msgstr "Ðе указан идентификатор пользователÑ."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Ðе указана запиÑÑŒ."
+msgstr "Ðе указан ключ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Ðет ID Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð² запроÑе."
+msgstr "Ключ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° не был запрошен."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Ðеверный или уÑтаревший ключ."
+msgstr "Задан неверный ключ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "ÐвторизоватьÑÑ"
+msgstr "Срок дейÑÑ‚Ð²Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð° Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° иÑтёк."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "ИÑходÑщие Ð´Ð»Ñ %s — Ñтраница %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2176,7 +2475,7 @@ msgstr "Ðе удаётÑÑ Ñохранить новый пароль."
msgid "Password saved."
msgstr "Пароль Ñохранён."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Пути"
@@ -2184,132 +2483,148 @@ msgstr "Пути"
msgid "Path and server settings for this StatusNet site."
msgstr "ÐаÑтройки путей и Ñерверов Ð´Ð»Ñ Ñтого Ñайта StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ‚ÐµÐ¼ недоÑтупна Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€ не доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ„Ð¾Ð½Ð¾Ð²Ñ‹Ñ… изображений не доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¹ не доÑтупна Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ðеверный SSL-Ñервер. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑоÑтавлÑет 255 Ñимволов."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Сайт"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Сервер"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Ð˜Ð¼Ñ Ñ…Ð¾Ñта Ñервера Ñайта."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Путь"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Путь к Ñайту"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "ПуÑть к локализациÑм"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Путь к директории локализаций"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Короткие URL"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "ИÑпользовать ли короткие (более читаемые и запоминаемые) URL-адреÑа?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Тема"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Сервер темы"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Путь темы"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ‚ÐµÐ¼Ñ‹"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Ðватары"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Сервер аватар"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Путь к аватарам"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Фоновые изображениÑ"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Сервер фонового изображениÑ"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Путь к фоновому изображению"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ„Ð¾Ð½Ð¾Ð²Ð¾Ð³Ð¾ изображениÑ"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Ðикогда"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Иногда"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Ð’Ñегда"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "ИÑпользовать SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Когда иÑпользовать SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-Ñервер"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Сервер, которому направлÑть SSL-запроÑÑ‹"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Сохранить пути"
@@ -2371,7 +2686,7 @@ msgid "Full name"
msgstr "Полное имÑ"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ГлавнаÑ"
@@ -2394,7 +2709,7 @@ msgstr "БиографиÑ"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "МеÑтораÑположение"
@@ -2420,7 +2735,7 @@ msgstr ""
"Теги Ð´Ð»Ñ Ñамого ÑÐµÐ±Ñ (буквы, цифры, -, ., и _), разделенные запÑтой или "
"пробелом"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Язык"
@@ -2446,7 +2761,7 @@ msgstr "ÐвтоматичеÑки подпиÑыватьÑÑ Ð½Ð° вÑех, кÑ
msgid "Bio is too long (max %d chars)."
msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð±Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ (макÑимум %d Ñимволов)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "ЧаÑовой поÑÑ Ð½Ðµ выбран."
@@ -2459,23 +2774,23 @@ msgstr "Слишком длинный Ñзык (более 50 Ñимволов).
msgid "Invalid tag: \"%s\""
msgstr "Ðеверный тег: «%s»"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¿Ð¾Ð´Ð¿Ð¸Ñки."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Ðе удаётÑÑ Ñохранить наÑтройки меÑтоположениÑ."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Ðе удаётÑÑ Ñохранить профиль."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Ðе удаётÑÑ Ñохранить теги."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "ÐаÑтройки Ñохранены."
@@ -2497,30 +2812,30 @@ msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°, Ñтраница %d"
msgid "Public timeline"
msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Лента публичного потока (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Лента публичного потока (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Лента публичного потока (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr "Это Ð¾Ð±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° %%site.name%%, однако пока никто ничего не отправил."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Создайте первую запиÑÑŒ!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2528,7 +2843,7 @@ msgstr ""
"Почему бы не [зарегиÑтрироватьÑÑ](%%action.register%%), чтобы Ñтать первым "
"отправителем?"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2542,7 +2857,7 @@ msgstr ""
"register%%), чтобы держать в курÑе Ñвоих Ñобытий поклонников, друзей, "
"родÑтвенников и коллег! ([Читать далее](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2580,7 +2895,7 @@ msgstr ""
"Почему бы не [зарегиÑтрироватьÑÑ](%%action.register%%), чтобы отправить "
"первым?"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Облако тегов"
@@ -2720,7 +3035,7 @@ msgstr "Извините, неверный приглаÑительный код
msgid "Registration successful"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÑпешна!"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑтрациÑ"
@@ -2767,7 +3082,7 @@ msgid "Same as password above. Required."
msgstr "Тот же пароль что и Ñверху. ОбÑзательное поле."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2872,7 +3187,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "ÐÐ´Ñ€ÐµÑ URL твоего Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð½Ð° другом подходÑщем ÑервиÑе микроблогинга"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "ПодпиÑатьÑÑ"
@@ -2908,7 +3223,7 @@ msgstr "Ð’Ñ‹ не можете повторить ÑобÑтвенную запÐ
msgid "You already repeated that notice."
msgstr "Ð’Ñ‹ уже повторили Ñту запиÑÑŒ."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Повторено"
@@ -2922,6 +3237,11 @@ msgstr "Повторено!"
msgid "Replies to %s"
msgstr "Ответы Ð´Ð»Ñ %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Ответы Ð´Ð»Ñ %1$s, Ñтраница %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2969,6 +3289,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Ответы на запиÑи %1$s на %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2978,6 +3302,122 @@ msgstr ""
msgid "User is already sandboxed."
msgstr "Пользователь уже в режиме пеÑочницы."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "СеÑÑии"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "ÐаÑтройки ÑеÑÑии Ð´Ð»Ñ Ñтого Ñайта StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Управление ÑеÑÑиÑми"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "УправлÑть ли ÑеÑÑиÑми ÑамоÑтоÑтельно."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Отладка ÑеÑÑий"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Включить отладочный вывод Ð´Ð»Ñ ÑеÑÑий."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Сохранить наÑтройки Ñайта"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы проÑматривать приложениÑ."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Профиль приложениÑ"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Иконка"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "ИмÑ"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "ОрганизациÑ"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "ОпиÑание"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "СтатиÑтика"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Создано %1$s — доÑтуп по умолчанию: %2$s — %3$d польз."
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "ДейÑÑ‚Ð²Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "СброÑить ключ и Ñекретную фразу"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ приложении"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "ПотребительÑкий ключ"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Ð¡ÐµÐºÑ€ÐµÑ‚Ð½Ð°Ñ Ñ„Ñ€Ð°Ð·Ð° потребителÑ"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL ключа запроÑа"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL ключа доÑтупа"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "URL авторизации"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Примечание: Мы поддерживаем подпиÑи HMAC-SHA1. Мы не поддерживаем метод "
+"подпиÑи открытым текÑтом."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+"Ð’Ñ‹ уверены, что хотите ÑброÑить ваш ключ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¸ Ñекретную фразу?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Любимые запиÑи %1$s, Ñтраница %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Ðе удаётÑÑ Ð²Ð¾ÑÑтановить любимые запиÑи."
@@ -3034,17 +3474,22 @@ msgstr "Это ÑпоÑоб разделить то, что вам нравитÑ
msgid "%s group"
msgstr "Группа %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Группа %1$s, Ñтраница %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Профиль группы"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "ЗапиÑÑŒ"
@@ -3090,10 +3535,6 @@ msgstr "(пока ничего нет)"
msgid "All members"
msgstr "Ð’Ñе учаÑтники"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "СтатиÑтика"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Создано"
@@ -3158,6 +3599,11 @@ msgstr "ЗапиÑÑŒ удалена."
msgid " tagged %s"
msgstr " Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, Ñтраница %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3183,12 +3629,12 @@ msgstr "Лента запиÑей Ð´Ð»Ñ %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF Ð´Ð»Ñ %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "Это лента %1$s, однако %2$s пока ничего не отправил."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3196,7 +3642,7 @@ msgstr ""
"Видели недавно что-нибудь интереÑное? Ð’Ñ‹ ещё не отправили ни одной запиÑи, "
"ÑÐµÐ¹Ñ‡Ð°Ñ Ñ…Ð¾Ñ€Ð¾ÑˆÐµÐµ Ð²Ñ€ÐµÐ¼Ñ Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3206,7 +3652,7 @@ msgstr ""
"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%2"
"$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3221,7 +3667,7 @@ msgstr ""
"ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑƒÑ‡Ð°Ñтника **%s** и иметь доÑтуп ко множеÑтву других возможноÑтей! "
"([Читать далее](%%%%doc.help%%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3233,7 +3679,7 @@ msgstr ""
"иÑпользованием Ñвободного программного обеÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ [StatusNet](http://status."
"net/)."
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Повтор за %s"
@@ -3250,199 +3696,146 @@ msgstr "Пользователь уже заглушён."
msgid "Basic settings for this StatusNet site."
msgstr "ОÑновные наÑтройки Ð´Ð»Ñ Ñтого Ñайта StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Ð˜Ð¼Ñ Ñайта должно быть ненулевой длины."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "У Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть дейÑтвительный контактный email-адреÑ."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "ÐеизвеÑтный Ñзык «%s»."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "Ðеверный URL отчёта Ñнимка."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Ðеверное значение запуÑка Ñнимка."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "ЧаÑтота Ñнимков должна быть чиÑлом."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Минимальное ограничение текÑта ÑоÑтавлÑет 140 Ñимволов."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "Ограничение Ð´ÑƒÐ±Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ ÑоÑтавлÑть 1 или более Ñекунд."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Базовые"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Ð˜Ð¼Ñ Ñайта"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Ð˜Ð¼Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ñайта, например, «Yourcompany Microblog»"
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "ПредоÑтавлено"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
"ТекÑÑ‚, иÑпользуемый Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¾Ð² в нижнем колонтитуле каждой Ñтраницы"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "URL-Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ñтавщика уÑлуг"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
"URL, иÑпользуемый Ð´Ð»Ñ ÑÑылки на авторов в нижнем колонтитуле каждой Ñтраницы"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Контактный email-Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ñайта"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Внутренние наÑтройки"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "ЧаÑовой поÑÑ Ð¿Ð¾ умолчанию"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "ЧаÑовой поÑÑ Ð¿Ð¾ умолчанию Ð´Ð»Ñ Ñайта; обычно UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Язык Ñайта по умолчанию"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL-адреÑа"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Сервер"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Ð˜Ð¼Ñ Ñ…Ð¾Ñта Ñервера Ñайта."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Короткие URL"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "ИÑпользовать ли короткие (более читаемые и запоминаемые) URL-адреÑа?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "ПринÑть"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Личное"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-"Запретить анонимным (не авторизовавшимÑÑ) пользователÑм проÑматривать Ñайт?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Только по приглашениÑм"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Разрешить региÑтрацию только по приглашениÑм."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Закрыта"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Отключить новые региÑтрации."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Снимки"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "При Ñлучайном поÑещении"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "По заданному графику"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Снимки данных"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Когда отправлÑть ÑтатиÑтичеÑкие данные на Ñервера status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "ЧаÑтота"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Снимки будут отправлÑтьÑÑ ÐºÐ°Ð¶Ð´Ñ‹Ðµ N поÑещений"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "URL отчёта"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Снимки будут отправлÑтьÑÑ Ð¿Ð¾ Ñтому URL-адреÑу"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Границы"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Границы текÑта"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "МакÑимальное чиÑло Ñимволов Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñей."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Предел дубликатов"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Сколько нужно ждать пользователÑм (в Ñекундах) Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ того же ещё раз."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Сохранить наÑтройки Ñайта"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "УÑтановки СМС"
@@ -3548,15 +3941,26 @@ msgstr "Код не введён"
msgid "You are not subscribed to that profile."
msgstr "Ð’Ñ‹ не подпиÑаны на Ñтот профиль."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Ðе удаётÑÑ Ñохранить подпиÑку."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ðе локальный пользователь."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ðет такого файла."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Ð’Ñ‹ не подпиÑаны на Ñтот профиль."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "ПодпиÑано"
@@ -3620,7 +4024,7 @@ msgstr "Это пользователи, запиÑи которых вы чит
msgid "These are the people whose notices %s listens to."
msgstr "Это пользователи, запиÑи которых читает %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3636,19 +4040,24 @@ msgstr ""
"пользуетеÑÑŒ [Твиттером](%%action.twittersettings%%), то можете автоматичеÑки "
"подпиÑатьÑÑ Ð½Ð° тех людей, за которыми уже Ñледите там."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не проÑматривает ничьи запиÑи."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "ЗапиÑи Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %1$s, Ñтраница %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3677,7 +4086,8 @@ msgstr "Теги %s"
msgid "User profile"
msgstr "Профиль пользователÑ"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Фото"
@@ -3737,7 +4147,7 @@ msgstr "Ðет ID Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð² запроÑе."
msgid "Unsubscribed"
msgstr "ОтпиÑано"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3753,85 +4163,65 @@ msgstr "Пользователь"
msgid "User settings for this StatusNet site."
msgstr "ПользовательÑкие наÑтройки Ð´Ð»Ñ Ñтого Ñайта StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Ðеверное ограничение биографии. Должно быть чиÑлом."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"Ðеверный текÑÑ‚ приветÑтвиÑ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑоÑтавлÑет 255 Ñимволов."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñка по умолчанию: «%1$s» не ÑвлÑетÑÑ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профиль"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Ограничение биографии"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° биографии Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð² Ñимволах."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Ðовые пользователи"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "ПриветÑтвие новым пользователÑм"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "ТекÑÑ‚ приветÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… пользователей (макÑимум 255 Ñимволов)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "ПодпиÑка по умолчанию"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "ÐвтоматичеÑки подпиÑывать новых пользователей на Ñтого пользователÑ."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "ПриглашениÑ"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Разрешать ли пользователÑм приглашать новых пользователей."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "СеÑÑии"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Управление ÑеÑÑиÑми"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "УправлÑть ли ÑеÑÑиÑми ÑамоÑтоÑтельно."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Отладка ÑеÑÑий"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Включить отладочный вывод Ð´Ð»Ñ ÑеÑÑий."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Ðвторизовать подпиÑку"
@@ -3846,36 +4236,36 @@ msgstr ""
"подпиÑатьÑÑ Ð½Ð° запиÑи Ñтого пользователÑ. ЕÑли Ð’Ñ‹ Ñтого не хотите делать, "
"нажмите «Отказ»."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "ЛицензиÑ"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "ПринÑть"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "ПодпиÑатьÑÑ Ð½Ð° %s"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "ОтброÑить"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Отвергнуть Ñту подпиÑку"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Ðе авторизованный запроÑ!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "ПодпиÑка авторизована"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3884,11 +4274,11 @@ msgstr ""
"ПодпиÑка авторизована, но нет обратного URL. ПоÑмотрите инÑтрукции на Ñайте "
"о том, как авторизовать подпиÑку. Ваш ключ подпиÑки:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "ПодпиÑка отменена"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3897,37 +4287,37 @@ msgstr ""
"ПодпиÑка отвергнута, но не бы передан URL обратного вызова. Проверьте "
"инÑтрукции на Ñайте, чтобы полноÑтью отказатьÑÑ Ð¾Ñ‚ подпиÑки."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "СмотрÑщий URI «%s» здеÑÑŒ не найден."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "ПроÑматриваемый URI «%s» Ñлишком длинный."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "ПроÑматриваемый URI «%s» — локальный пользователь."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "URL Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Â«%s» предназначен только Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ пользователÑ."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "URL аватары «%s» недейÑтвителен."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ URL аватары «%s»"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Ðеверный тип Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ URL аватары «%s»."
@@ -3948,6 +4338,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "ПриÑтного аппетита!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Группы %1$s, Ñтраница %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "ИÑкать другие группы"
@@ -3977,10 +4372,6 @@ msgstr ""
"Этот Ñайт Ñоздан на оÑнове %1$s верÑии %2$s, Copyright 2008-2010 StatusNet, "
"Inc. и учаÑтники."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Разработчики"
@@ -4022,11 +4413,7 @@ msgstr ""
msgid "Plugins"
msgstr "Плагины"
-#: actions/version.php:195
-msgid "Name"
-msgstr "ИмÑ"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "ВерÑиÑ"
@@ -4034,10 +4421,6 @@ msgstr "ВерÑиÑ"
msgid "Author(s)"
msgstr "Ðвтор(Ñ‹)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑание"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4058,19 +4441,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Файл такого размера превыÑит вашу меÑÑчную квоту в %d байта."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Профиль группы"
+msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸ÑоединитьÑÑ Ðº группе."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ информацию о группе."
+msgstr "Ðе ÑвлÑетÑÑ Ñ‡Ð°Ñтью группы."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Профиль группы"
+msgstr "Ðе удаётÑÑ Ð¿Ð¾ÐºÐ¸Ð½ÑƒÑ‚ÑŒ группу."
#: classes/Login_token.php:76
#, php-format
@@ -4089,27 +4469,27 @@ msgstr "Ðе удаётÑÑ Ð²Ñтавить Ñообщение."
msgid "Could not update message with new URI."
msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñообщение Ñ Ð½Ð¾Ð²Ñ‹Ð¼ URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Ошибка баз данных при вÑтавке хеш-тегов Ð´Ð»Ñ %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Проблемы Ñ Ñохранением запиÑи. Слишком длинно."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при Ñохранении запиÑи. ÐеизвеÑтный пользователь."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Слишком много запиÑей за Ñтоль короткий Ñрок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4117,34 +4497,57 @@ msgstr ""
"Слишком много одинаковых запиÑей за Ñтоль короткий Ñрок; передохните немного "
"и попробуйте вновь через пару минут."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поÑтитьÑÑ Ð½Ð° Ñтом Ñайте (бан)"
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблемы Ñ Ñохранением запиÑи."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Ошибка баз данных при вÑтавке ответа Ð´Ð»Ñ %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Проблемы Ñ Ñохранением входÑщих Ñообщений группы."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Ð’Ñ‹ заблокированы от подпиÑки."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Уже подпиÑаны!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Пользователь заблокировал ВаÑ."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Ðе подпиÑаны!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Ðевозможно удалить ÑамоподпиÑку."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ подпиÑку."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Ðе удаётÑÑ Ñоздать группу."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Ðе удаётÑÑ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÑŒ членÑтво в группе."
@@ -4177,136 +4580,132 @@ msgid "Other options"
msgstr "Другие опции"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s — %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Страница без названиÑ"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Моё"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
-#: lib/action.php:435
-msgid "Account"
-msgstr "ÐаÑтройки"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватару, пароль, профиль"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Соединить"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Соединить Ñ ÑервиÑами"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Изменить конфигурацию Ñайта"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ПриглаÑить"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr "ПриглаÑи друзей и коллег Ñтать такими же как ты учаÑтниками %s"
+msgstr "ПриглаÑите друзей и коллег Ñтать такими же как вы учаÑтниками %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Выход"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "ПоиÑк"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "ИÑкать людей или текÑÑ‚"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "ÐÐ°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ Ð¿Ð¾ подпиÑкам"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "О проекте"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "ПользовательÑкое Ñоглашение"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "ИÑходный код"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet лицензиÑ"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4315,50 +4714,75 @@ msgstr ""
"**%%site.name%%** — Ñто ÑÐµÑ€Ð²Ð¸Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°, Ñозданный Ð´Ð»Ñ Ð²Ð°Ñ Ð¿Ñ€Ð¸ помощи [%"
"%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — ÑÐµÑ€Ð²Ð¸Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Этот ÑÐµÑ€Ð²Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ при помощи [StatusNet](http://status.net/) - "
-"программного обеÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°, верÑии %s, доÑтупного под "
+"Этот ÑÐµÑ€Ð²Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ при помощи [StatusNet](http://status.net/) — "
+"программного обеÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð³Ð¸Ð½Ð³Ð°, верÑии %s, доÑтупного под "
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ñодержимого Ñайта"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Содержание и данные %1$s ÑвлÑÑŽÑ‚ÑÑ Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ и конфиденциальными."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"ÐвторÑкие права на Ñодержание и данные принадлежат %1$s. Ð’Ñе права защищены."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"ÐвторÑкие права на Ñодержание и данные принадлежат разработчикам. Ð’Ñе права "
+"защищены."
+
+#: lib/action.php:827
msgid "All "
msgstr "All "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "license."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Разбиение на Ñтраницы"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Туда"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4388,10 +4812,101 @@ msgstr "ОÑÐ½Ð¾Ð²Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñайта"
msgid "Design configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð¾Ñтупа"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑеÑÑий"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"API реÑурÑа требует доÑтуп Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запиÑи, но у Ð²Ð°Ñ ÐµÑть только доÑтуп "
+"Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"ÐÐµÑƒÐ´Ð°Ñ‡Ð½Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° авторизации через API, nickname = %1$s, proxy = %2$s, ip = "
+"%3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Изменить приложение"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Иконка Ð´Ð»Ñ Ñтого приложениÑ"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Опишите ваше приложение при помощи %d Ñимволов"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Опишите ваше приложение"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL иÑточника"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL-Ð°Ð´Ñ€ÐµÑ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ Ñтраницы Ñтого приложениÑ"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "ОрганизациÑ, ответÑÑ‚Ð²ÐµÐ½Ð½Ð°Ñ Ð·Ð° Ñто приложение"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL-Ð°Ð´Ñ€ÐµÑ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ Ñтраницы организации"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле проверки подлинноÑти"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Браузер"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÑиÑтема"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Среда Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: браузер или Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÑиÑтема"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Только чтение"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Чтение и запиÑÑŒ"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"ДоÑтуп по умолчанию Ð´Ð»Ñ Ñтого приложениÑ: только чтение или чтение и запиÑÑŒ"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Отозвать"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "ВложениÑ"
@@ -4412,11 +4927,11 @@ msgstr "Сообщает, где поÑвлÑетÑÑ Ñто вложение"
msgid "Tags for this attachment"
msgstr "Теги Ð´Ð»Ñ Ñтого вложениÑ"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Изменение Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ удалоÑÑŒ"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ разрешена"
@@ -4567,83 +5082,93 @@ msgstr "Проблемы Ñ Ñохранением запиÑи."
msgid "Specify the name of the user to subscribe to"
msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñки."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Ðет такого пользователÑ."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "ПодпиÑано на %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ подпиÑки."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "ОтпиÑано от %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Команда ещё не выполнена."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Оповещение отÑутÑтвует."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Ðет оповещениÑ."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "ЕÑть оповещение."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "ЕÑть оповещение."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Команда входа отключена"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Эта ÑÑылка дейÑтвительна только один раз в течение 2 минут: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ОтпиÑано от %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Ð’Ñ‹ ни на кого не подпиÑаны."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ð’Ñ‹ подпиÑаны на Ñтих людей:"
msgstr[1] "Ð’Ñ‹ подпиÑаны на Ñтих людей:"
msgstr[2] "Ð’Ñ‹ подпиÑаны на Ñтих людей:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Ðикто не подпиÑан на ваÑ."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подпиÑалиÑÑŒ на ваÑ:"
msgstr[1] "Эти люди подпиÑалиÑÑŒ на ваÑ:"
msgstr[2] "Эти люди подпиÑалиÑÑŒ на ваÑ:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Ð’Ñ‹ не ÑоÑтоите ни в одной группе."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ð’Ñ‹ ÑвлÑетеÑÑŒ учаÑтником Ñледующих групп:"
msgstr[1] "Ð’Ñ‹ ÑвлÑетеÑÑŒ учаÑтником Ñледующих групп:"
msgstr[2] "Ð’Ñ‹ ÑвлÑетеÑÑŒ учаÑтником Ñледующих групп:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4657,6 +5182,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4721,19 +5247,19 @@ msgstr ""
"tracks — пока не реализовано.\n"
"tracking — пока не реализовано.\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Конфигурационный файл не найден. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Конфигурационные файлы иÑкалиÑÑŒ в Ñледующих меÑтах: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Возможно, вы решите запуÑтить уÑтановщик Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтого."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Перейти к уÑтановщику"
@@ -4749,6 +5275,14 @@ msgstr "Обновлено по IM"
msgid "Updates by SMS"
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ СМС"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "СоединениÑ"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Ðвторизованные Ñоединённые приложениÑ"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Ошибка базы данных"
@@ -4935,15 +5469,15 @@ msgstr "МБ"
msgid "kB"
msgstr "КБ"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "ÐеизвеÑтный Ñзык «%s»."
+msgstr "ÐеизвеÑтный иÑточник входÑщих Ñообщений %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5221,7 +5755,7 @@ msgstr ""
"Ð²Ð¾Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей в разговор. СообщениÑ, получаемые от других "
"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "от "
@@ -5335,62 +5869,59 @@ msgid "Share my location"
msgstr "ПоделитьÑÑ Ñвоим меÑтоположением."
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Ðе публиковать Ñвоё меÑтоположение."
+msgstr "Ðе публиковать Ñвоё меÑтоположение"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Скрыть Ñту информацию"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"К Ñожалению, получение информации о вашем меÑтонахождении занÑло больше "
+"времени, чем ожидалоÑÑŒ; повторите попытку позже"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Ñ. ш."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ю. ш."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "в. д."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "з. д."
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "на"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "в контекÑте"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Ответить на Ñту запиÑÑŒ"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Ответить"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "ЗапиÑÑŒ повторена"
@@ -5422,11 +5953,7 @@ msgstr "Ошибка вÑтавки удалённого профилÑ"
msgid "Duplicate notice"
msgstr "Дублировать запиÑÑŒ"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Ð’Ñ‹ заблокированы от подпиÑки."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Ðе удаётÑÑ Ð²Ñтавить новую подпиÑку."
@@ -5442,19 +5969,19 @@ msgstr "Ответы"
msgid "Favorites"
msgstr "Любимое"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "ВходÑщие"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Ваши входÑщие ÑообщениÑ"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "ИÑходÑщие"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Ваши иÑходÑщие ÑообщениÑ"
@@ -5531,6 +6058,10 @@ msgstr "Повторить Ñту запиÑÑŒ?"
msgid "Repeat this notice"
msgstr "Повторить Ñту запиÑÑŒ"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Ðи задан пользователь Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого режима."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "ПеÑочница"
@@ -5598,34 +6129,6 @@ msgstr "Люди подпиÑанные на %s"
msgid "Groups %s is a member of"
msgstr "Группы, в которых ÑоÑтоит %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Уже подпиÑаны!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Пользователь заблокировал ВаÑ."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "ПодпиÑка неудачна."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñать других на вашу ленту."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Ðе подпиÑаны!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Ðевозможно удалить ÑамоподпиÑку."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ подпиÑку."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5676,67 +6179,67 @@ msgstr "Изменить аватару"
msgid "User actions"
msgstr "ДейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Изменение наÑтроек профилÑ"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Редактировать"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "ПоÑлать приватное Ñообщение Ñтому пользователю."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Сообщение"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Модерировать"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "пару Ñекунд назад"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "около чаÑа назад"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "около %d чаÑа(ов) назад"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "около меÑÑца назад"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑца(ев) назад"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "около года назад"
@@ -5752,7 +6255,7 @@ msgstr ""
"%s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым цветом! ИÑпользуйте 3 или 6 шеÑтнадцатеричных "
"Ñимволов."
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/statusnet.po b/locale/statusnet.po
index fb8fd0ad6..cf44e2d3c 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,58 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr ""
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr ""
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr ""
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr ""
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr ""
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr ""
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr ""
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -31,25 +83,29 @@ msgstr ""
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr ""
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr ""
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -90,7 +146,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -101,8 +157,8 @@ msgstr ""
msgid "You and friends"
msgstr ""
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -112,23 +168,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr ""
@@ -142,7 +198,7 @@ msgstr ""
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -171,8 +227,9 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -286,11 +343,11 @@ msgstr ""
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr ""
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr ""
@@ -312,7 +369,8 @@ msgstr ""
msgid "Not a valid nickname."
msgstr ""
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -324,7 +382,8 @@ msgstr ""
msgid "Full name is too long (max 255 chars)."
msgstr ""
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
@@ -360,7 +419,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr ""
@@ -401,6 +460,110 @@ msgstr ""
msgid "groups on %s"
msgstr ""
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr ""
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr ""
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr ""
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -430,17 +593,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -454,7 +617,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -465,7 +628,7 @@ msgstr ""
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -481,27 +644,22 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -511,7 +669,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -571,8 +729,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr ""
@@ -584,29 +742,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -642,8 +777,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr ""
@@ -651,13 +787,13 @@ msgstr ""
msgid "Do not block this user"
msgstr ""
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr ""
@@ -740,7 +876,7 @@ msgid "Couldn't delete email confirmation."
msgstr ""
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr ""
#: actions/confirmaddress.php:159
@@ -757,10 +893,48 @@ msgstr ""
msgid "Notices"
msgstr ""
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr ""
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr ""
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr ""
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr ""
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr ""
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr ""
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -789,7 +963,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -917,16 +1091,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -939,8 +1103,74 @@ msgstr ""
msgid "Add to favorites"
msgstr ""
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr ""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr ""
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr ""
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr ""
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr ""
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr ""
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr ""
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
msgstr ""
#: actions/editgroup.php:56
@@ -970,7 +1200,7 @@ msgstr ""
msgid "Could not update group."
msgstr ""
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr ""
@@ -1009,7 +1239,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr ""
@@ -1089,7 +1320,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr ""
@@ -1101,7 +1332,7 @@ msgstr ""
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr ""
@@ -1160,7 +1391,7 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr ""
@@ -1302,7 +1533,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr ""
@@ -1393,23 +1624,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1568,6 +1799,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr ""
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1644,7 +1880,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr ""
@@ -1718,7 +1954,7 @@ msgstr ""
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
@@ -1727,17 +1963,6 @@ msgstr ""
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr ""
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr ""
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr ""
@@ -1763,21 +1988,21 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr ""
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr ""
@@ -1786,6 +2011,26 @@ msgstr ""
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr ""
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr ""
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -1890,6 +2135,48 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr ""
@@ -1907,8 +2194,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -1921,7 +2208,7 @@ msgid "Notice Search"
msgstr ""
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr ""
#: actions/othersettings.php:71
@@ -1972,6 +2259,11 @@ msgstr ""
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2042,7 +2334,7 @@ msgstr ""
msgid "Password saved."
msgstr ""
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2050,132 +2342,148 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr ""
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr ""
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr ""
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr ""
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr ""
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr ""
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr ""
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr ""
@@ -2233,7 +2541,7 @@ msgid "Full name"
msgstr ""
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr ""
@@ -2256,7 +2564,7 @@ msgstr ""
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr ""
@@ -2280,7 +2588,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr ""
@@ -2306,7 +2614,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2319,23 +2627,23 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr ""
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr ""
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -2357,36 +2665,36 @@ msgstr ""
msgid "Public timeline"
msgstr ""
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr ""
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2395,7 +2703,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2428,7 +2736,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2564,7 +2872,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2604,7 +2912,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2688,7 +2996,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -2724,7 +3032,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr ""
@@ -2738,6 +3046,11 @@ msgstr ""
msgid "Replies to %s"
msgstr ""
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr ""
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2779,6 +3092,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr ""
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr ""
@@ -2787,6 +3104,119 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr ""
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr ""
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr ""
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr ""
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr ""
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2836,17 +3266,22 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr ""
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr ""
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr ""
@@ -2892,10 +3327,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr ""
-
#: actions/showgroup.php:432
msgid "Created"
msgstr ""
@@ -2950,6 +3381,11 @@ msgstr ""
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr ""
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -2975,25 +3411,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3002,7 +3438,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3010,7 +3446,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr ""
@@ -3027,195 +3463,143 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr ""
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr ""
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr ""
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr ""
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr ""
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr ""
@@ -3312,15 +3696,24 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr ""
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr ""
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3380,7 +3773,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3390,19 +3783,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr ""
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3431,7 +3829,8 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3486,7 +3885,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr ""
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3501,84 +3900,64 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr ""
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr ""
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr ""
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3590,84 +3969,84 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr ""
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr ""
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr ""
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr ""
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr ""
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr ""
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3686,6 +4065,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr ""
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3712,10 +4096,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr ""
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3747,11 +4127,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-msgid "Name"
-msgstr ""
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr ""
@@ -3759,10 +4135,6 @@ msgstr ""
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3809,58 +4181,81 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr ""
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr ""
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr ""
@@ -3901,140 +4296,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-msgid "Account"
-msgstr ""
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr ""
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr ""
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr ""
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr ""
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr ""
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4042,32 +4433,54 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr ""
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4098,10 +4511,96 @@ msgstr ""
msgid "Design configuration"
msgstr ""
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr ""
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr ""
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr ""
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr ""
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr ""
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr ""
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr ""
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4122,11 +4621,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr ""
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr ""
@@ -4274,80 +4773,89 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr ""
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, php-format
+msgid "Unsubscribed %s"
+msgstr ""
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4361,6 +4869,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4388,19 +4897,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4416,6 +4925,14 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr ""
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4598,12 +5115,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -4798,7 +5315,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -4913,57 +5430,53 @@ msgid "Do not share my location"
msgstr ""
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr ""
@@ -4995,11 +5508,7 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5015,19 +5524,19 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5104,6 +5613,10 @@ msgstr ""
msgid "Repeat this notice"
msgstr ""
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5171,34 +5684,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr ""
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr ""
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5249,67 +5734,67 @@ msgstr ""
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr ""
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr ""
@@ -5323,7 +5808,7 @@ msgstr ""
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index aab154caf..b09823e6b 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,17 +9,70 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:09+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:44+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "Ã…tkomst"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Inställningar för webbplatsåtkomst"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "Registrering"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Privat"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Skall anonyma användare (inte inloggade) förhindras från att se webbplatsen?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Endast inbjudan"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Gör så att registrering endast sker genom inbjudan."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Stängd"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "Inaktivera nya registreringar."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Spara"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Spara inställningar för åtkomst"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -34,25 +87,29 @@ msgstr "Ingen sådan sida"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ingen sådan användare."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s och vänner, sida %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -77,7 +134,7 @@ msgstr "Flöden för %ss vänner (Atom)"
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "Detta är tidslinjen för %s och vänner men ingen har postat något än."
+msgstr "Detta är tidslinjen för %s och vänner, men ingen har skrivit något än."
#: actions/all.php:132
#, php-format
@@ -86,33 +143,33 @@ msgid ""
"something yourself."
msgstr ""
"Prova att prenumerera på fler personer, [gå med i en grupp](%%action.groups%"
-"%) eller posta något själv."
+"%) eller skriv något själv."
#: actions/all.php:134
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Du kan prova att [knuffa %s](../%s) från dennes profil eller [posta "
+"Du kan prova att [knuffa %1$s](../%2$s) från dennes profil eller [skriva "
"någonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?"
-"status_textarea=%s)."
+"status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
"Varför inte [registrera ett konto](%%%%action.register%%%%) och sedan knuffa "
-"%s eller posta en notis för hans eller hennes uppmärksamhet."
+"%s eller skriva en notis för hans eller hennes uppmärksamhet."
#: actions/all.php:165
msgid "You and friends"
msgstr "Du och vänner"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Uppdateringar från %1$s och vänner på %2$s!"
@@ -122,25 +179,25 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
-msgstr "API-metoden hittades inte"
+msgstr "API-metod hittades inte."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofile.php:89
@@ -152,7 +209,7 @@ msgstr "API-metoden hittades inte"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Denna metod kräver en POST."
@@ -181,8 +238,9 @@ msgstr "Kunde inte spara profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -222,7 +280,7 @@ msgstr "Hävning av blockering av användare misslyckades."
#: actions/apidirectmessage.php:89
#, php-format
msgid "Direct messages from %s"
-msgstr "Direktmeddelande från %s"
+msgstr "Direktmeddelanden från %s"
#: actions/apidirectmessage.php:93
#, php-format
@@ -262,18 +320,16 @@ msgid "No status found with that ID."
msgstr "Ingen status hittad med det ID:t."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "Denna status är redan en favorit!"
+msgstr "Denna status är redan en favorit."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "Kunde inte skapa favorit."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "Denna status är inte en favorit!"
+msgstr "Denna status är inte en favorit."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -293,21 +349,20 @@ msgid "Could not unfollow user: User not found."
msgstr "Kunde inte sluta följa användaren: användaren hittades inte."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "Du kan inte sluta följa dig själv!"
+msgstr "Du kan inte sluta följa dig själv."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "Två användar-ID:n eller screen_names måste tillhandahållas."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
-msgstr ""
+msgstr "Kunde inte fastställa användare hos källan."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
-msgstr ""
+msgstr "Kunde inte hitta målanvändare."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -328,7 +383,8 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
msgid "Not a valid nickname."
msgstr "Inte ett giltigt smeknamn."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -340,10 +396,11 @@ msgstr "Hemsida är inte en giltig URL."
msgid "Full name is too long (max 255 chars)."
msgstr "Fullständigt namn är för långt (max 255 tecken)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "Beskrivning är för lång (max 140 tecken)"
+msgstr "Beskrivning är för lång (max 140 tecken)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -376,7 +433,7 @@ msgstr "Alias kan inte vara samma som smeknamn."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Grupp hittades inte!"
@@ -389,18 +446,18 @@ msgid "You have been blocked from that group by the admin."
msgstr "Du har blivit blockerad från denna grupp av administratören."
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Kunde inte ansluta användare % till grupp %s."
+msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr "Du är inte en medlem i denna grupp."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Kunde inte ta bort användare %s från grupp %s."
+msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -417,6 +474,113 @@ msgstr "%s grupper"
msgid "groups on %s"
msgstr "grupper på %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Ingen oauth_token-parameter angiven."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Ogiltig token."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Ogiltigt smeknamn / lösenord!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Databasfel vid borttagning av OAuth-applikationsanvändare."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr "Begäran-token %s har godkänts. Byt ut den mot en åtkomst-token."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Begäran-token %s har nekats och återkallats."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Oväntat inskick av formulär."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "En applikation skulle vilja ansluta till ditt konto"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Tillåt eller neka åtkomst"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Applikationen <strong>%1$s</strong> av <strong>%2$s</strong> vill att "
+"möjligheten att <strong>%3$s</strong> din %4$s kontoinformation. Du bör bara "
+"ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Lösenord"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Neka"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Tillåt"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Tillåt eller neka åtkomst till din kontoinformation."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Denna metod kräver en POST eller en DELETE."
@@ -446,34 +610,34 @@ msgstr "Status borttagen."
msgid "No status with that ID found."
msgstr "Ingen status med det ID:t hittades."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Hittades inte"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maximal notisstorlek är %d tecken, inklusive bilage-URL."
+msgstr "Maximal notisstorlek är %d tecken, inklusive URL för bilaga."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
msgstr "Format som inte stödjs."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favoriter från %s"
+msgstr "%1$s / Favoriter från %2$s"
-#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:117
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s uppdateringar markerade som favorit av %s / %s."
+msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -481,7 +645,7 @@ msgstr "%s uppdateringar markerade som favorit av %s / %s."
msgid "%s timeline"
msgstr "%s tidslinje"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -497,27 +661,22 @@ msgstr "%1$s / Uppdateringar som nämner %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publika tidslinje"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s uppdateringar från alla!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Upprepat av %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Upprepat till %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Upprepningar av %s"
@@ -527,7 +686,7 @@ msgstr "Upprepningar av %s"
msgid "Notices tagged with %s"
msgstr "Notiser taggade med %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Uppdateringar taggade med %1$s på %2$s!"
@@ -588,8 +747,8 @@ msgstr "Orginal"
msgid "Preview"
msgstr "Förhandsgranska"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Ta bort"
@@ -601,29 +760,6 @@ msgstr "Ladda upp"
msgid "Crop"
msgstr "Beskär"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Oväntat inskick av formulär."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Välj ett kvadratiskt område i bilden som din avatar"
@@ -662,8 +798,9 @@ msgstr ""
"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i "
"framtiden och du kommer inte bli underrättad om några @-svar från dem."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Nej"
@@ -671,13 +808,13 @@ msgstr "Nej"
msgid "Do not block this user"
msgstr "Blockera inte denna användare"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Blockera denna användare"
@@ -701,9 +838,9 @@ msgid "%s blocked profiles"
msgstr "%s blockerade profiler"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s blockerade profiler, sida %d"
+msgstr "%1$s blockerade profiler, sida %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -761,7 +898,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Kunde inte ta bort e-postbekräftelse."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Bekräfta adress"
#: actions/confirmaddress.php:159
@@ -778,10 +915,51 @@ msgstr "Konversationer"
msgid "Notices"
msgstr "Notiser"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Du måste vara inloggad för att ta bort en applikation."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Applikation hittades inte."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Du är inte ägaren av denna applikation."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Det var ett problem med din sessions-token."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Ta bort applikation"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Är du säker på att du vill ta bort denna applikation? Detta kommer rensa "
+"bort all data om applikationen från databasen, inklusive alla befintliga "
+"användaranslutningar."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Ta inte bort denna applikation"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Ta bort denna applikation"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -812,7 +990,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?"
msgid "Do not delete this notice"
msgstr "Ta inte bort denna notis"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Ta bort denna notis"
@@ -944,16 +1122,6 @@ msgstr "Återställ standardutseende"
msgid "Reset back to default"
msgstr "Återställ till standardvärde"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Spara"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Spara utseende"
@@ -966,9 +1134,75 @@ msgstr "Denna notis är inte en favorit!"
msgid "Add to favorites"
msgstr "Lägg till i favoriter"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Inget sådant dokument."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Inget sådant dokument \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Redigera applikation"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Du måste vara inloggad för att redigera en applikation."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Ingen sådan applikation."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Använd detta formulär för att redigera din applikation."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Namn krävs."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Namnet är för långt (max 255 tecken)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Namnet används redan. Prova ett annat."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Beskrivning krävs."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "URL till källa är för lång."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "URL till källa är inte giltig."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organisation krävs."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organisation är för lång (max 255 tecken)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Hemsida för organisation krävs."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Anrop är för lång."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "URL för anrop är inte giltig."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Kunde inte uppdatera applikation."
#: actions/editgroup.php:56
#, php-format
@@ -981,9 +1215,8 @@ msgstr "Du måste vara inloggad för att skapa en grupp."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "Du måste vara inloggad för att redigera gruppen"
+msgstr "Du måste vara en administratör för att redigera gruppen."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -998,7 +1231,7 @@ msgstr "beskrivning är för lång (max %d tecken)."
msgid "Could not update group."
msgstr "Kunde inte uppdatera grupp."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Kunde inte skapa alias."
@@ -1007,7 +1240,6 @@ msgid "Options saved."
msgstr "Alternativ sparade."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "E-postinställningar"
@@ -1040,14 +1272,14 @@ msgstr ""
"skräppostkorg!) efter ett meddelande med vidare instruktioner."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Avbryt"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "E-postadresser"
+msgstr "E-postadress"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1122,19 +1354,19 @@ msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den e-postadressen"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr "Detta är redan din e-postadress."
+msgstr "Det är redan din e-postadress."
#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Den e-postadressen tillhör redan en annan användare."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Kunde inte infoga bekräftelsekod."
@@ -1164,7 +1396,7 @@ msgstr "Bekräftelse avbruten."
#: actions/emailsettings.php:413
msgid "That is not your email address."
-msgstr "Detta är inte din e-postadress."
+msgstr "Det är inte din e-postadress."
#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
@@ -1196,7 +1428,7 @@ msgstr "Denna notis är redan en favorit!"
msgid "Disfavor favorite"
msgstr "Ta bort märkning som favorit"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Populära notiser"
@@ -1221,8 +1453,8 @@ msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr ""
-"Bli först att lägga en notis till dina favoriter genom att klicka på favorit-"
-"knappen bredvid någon notis du gillar."
+"Var den första att lägga en notis till dina favoriter genom att klicka på "
+"favorit-knappen bredvid någon notis du gillar."
#: actions/favorited.php:156
#, php-format
@@ -1230,8 +1462,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
-"Varför inte [registrera ett konto](%%action.register%%) och bli först att "
-"lägga en notis till dina favoriter!"
+"Varför inte [registrera ett konto](%%action.register%%) och vara först med "
+"att lägga en notis till dina favoriter!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1297,7 +1529,7 @@ msgstr "Du har inte tillstånd."
#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
-msgstr "Kunde inte konvertera förfrågnings-token till access-token."
+msgstr "Kunde inte konvertera token för begäran till token för åtkomst."
#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
@@ -1344,20 +1576,20 @@ msgstr "Användaren är redan blockerad från grupp."
msgid "User is not a member of group."
msgstr "Användare är inte en gruppmedlem."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Blockera användare från grupp"
#: actions/groupblock.php:162
-#, fuzzy, php-format
+#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
-"Är du säker på att du vill blockera användare \"%s\" från gruppen \"%s\"? De "
-"kommer bli borttagna från gruppen, inte kunna posta och inte kunna "
-"prenumerera på gruppen i framtiden."
+"Är du säker på att du vill blockera användare \"%1$s\" från gruppen \"%2$s"
+"\"? De kommer bli borttagna från gruppen, inte kunna skriva till och inte "
+"kunna prenumerera på gruppen i framtiden."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1412,9 +1644,8 @@ msgstr ""
"s."
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "Användare utan matchande profil"
+msgstr "Användare utan matchande profil."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1434,31 +1665,31 @@ msgid "%s group members"
msgstr "%s gruppmedlemmar"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "%s gruppmedlemmar, sida %d"
+msgstr "%1$s gruppmedlemmar, sida %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "En lista av användarna i denna grupp."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administratör"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Blockera"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Gör användare till en administratör för gruppen"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Gör till administratör"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Gör denna användare till administratör"
@@ -1486,9 +1717,9 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
-"%%%%site.name%%%% grupper låter dig hitta och prata med personer med "
+"%%%%site.name%%%% grupper låter dig hitta och samtala med personer med "
"liknande intressen. Efter att ha gått med i en grupp kan du skicka "
-"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du "
+"meddelanden till alla andra medlemmar mha syntaxen \"!gruppnamn\". Ser du "
"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
@@ -1546,9 +1777,8 @@ msgid "Error removing the block."
msgstr "Fel vid hävning av blockering."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
-msgstr "IM-inställningar"
+msgstr "Inställningar för snabbmeddelanden"
#: actions/imsettings.php:70
#, php-format
@@ -1556,7 +1786,7 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"Du kan skicka och ta emot notiser genom Jabber/GTalk [snabbmeddelanden](%%"
+"Du kan skicka och ta emot notiser genom Jabber/GTalk-[snabbmeddelanden](%%"
"doc.im%%). Konfigurera din adress och dina inställningar nedan."
#: actions/imsettings.php:89
@@ -1573,13 +1803,12 @@ msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-"Väntar bekräftelse av denna adress. Kontrollera ditt Jabber/GTalk-konto för "
-"vidare instruktioner. (La du till %s i din kompislista?)"
+"Väntar på bekräftelse för denna adress. Kontrollera ditt Jabber/GTalk-konto "
+"för vidare instruktioner. (La du till %s i din kompislista?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
-msgstr "IM-adress"
+msgstr "Adress för snabbmeddelanden"
#: actions/imsettings.php:126
#, php-format
@@ -1587,8 +1816,8 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Jabber- eller GTalk-adress liknande \"användarnamn@example.org\". Se först "
-"till att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
+"Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först till "
+"att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
#: actions/imsettings.php:143
msgid "Send me notices through Jabber/GTalk."
@@ -1634,13 +1863,18 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"En bekräftelsekod har skickats till den IM-adress du angav. Du måste "
-"godkänna att %s får skicka meddelanden till dig."
+"En bekräftelsekod skickades till den IM-adress du angav. Du måste godkänna "
+"att %s får skicka meddelanden till dig."
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
msgstr "Detta är inte ditt Jabber-ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Inkorg för %1$s - sida %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1705,8 +1939,8 @@ msgstr ""
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
-"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
-"webbplats."
+"Använd detta formulär för att bjuda in dina vänner och kollegor att använda "
+"denna tjänst."
#: actions/invite.php:187
msgid "Email addresses"
@@ -1724,7 +1958,7 @@ msgstr "Personligt meddelande"
msgid "Optionally add a personal message to the invitation."
msgstr "Om du vill, skriv ett personligt meddelande till inbjudan."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Skicka"
@@ -1763,15 +1997,41 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"%1$s har bjudit in dig till dem på %2$s (%3$s).\n"
+"\n"
+"%2$s är en mikrobloggtjänst som låter dig hålla dig uppdaterad med folk du "
+"känner och folk som intresserar dig . \n"
+"\n"
+"Du kan också dela nyheter om dig själv, dina tankar, eller ditt liv online "
+"med folk som känner till dig. Det är också bra för att träffa nya människor "
+"som delar dina intressen.\n"
+"\n"
+"%1$s sa:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan se %1$ss profilsida på %2$s här: \n"
+"\n"
+"%5$s\n"
+"\n"
+"Om du vill prova tjänsten, klicka på länken nedan för att acceptera "
+"inbjudan. \n"
+"\n"
+"%6$s\n"
+"\n"
+"Om inte, kan du bortse från detta meddelande. Tack för ditt tålamod och din "
+"tid\n"
+"\n"
+"Vänliga hälsningar, %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s gick med i grupp %s"
+msgstr "%1$s gick med i grupp %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -1782,9 +2042,9 @@ msgid "You are not a member of that group."
msgstr "Du är inte en medlem i den gruppen."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s lämnade grupp %s"
+msgstr "%1$s lämnade grupp %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1798,7 +2058,7 @@ msgstr "Felaktigt användarnamn eller lösenord."
msgid "Error setting user. You are probably not authorized."
msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
@@ -1807,17 +2067,6 @@ msgstr "Logga in"
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Smeknamn"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Lösenord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Kom ihåg mig"
@@ -1847,29 +2096,49 @@ msgstr ""
"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
"[Registrera](%%action.register%%) ett nytt konto."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Bara en administratör kan göra en annan användare till administratör."
-#: actions/makeadmin.php:95
-#, fuzzy, php-format
+#: actions/makeadmin.php:96
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s är redan en administratör för grupp \"%s\"."
+msgstr "%1$s är redan en administratör för grupp \"%2$s\"."
-#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#: actions/makeadmin.php:133
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Kan inte hämta uppgift om medlemskap för %s i grupp %s"
+msgstr "Kan inte hämta uppgift om medlemskap för %1$s i grupp %2$s."
-#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#: actions/makeadmin.php:146
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Kan inte göra %s till en administratör för grupp %s"
+msgstr "Kan inte göra %1$s till en administratör för grupp %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "Ingen aktuell status"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Ny applikation"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Du måste vara inloggad för att registrera en applikation."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Använd detta formulär för att registrera en ny applikation."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "URL till källa krävs."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Kunde inte skapa applikation."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ny grupp"
@@ -1907,9 +2176,9 @@ msgid "Message sent"
msgstr "Meddelande skickat"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "Direktmeddelande till %s skickat"
+msgstr "Direktmeddelande till %s skickat."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1937,9 +2206,9 @@ msgid "Text search"
msgstr "Textsökning"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Sökresultat för \"%s\" på %s"
+msgstr "Sökresultat för \"%1$s\" på %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -1947,8 +2216,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
-"Bli först att [posta i detta ämne](%%%%action.newnotice%%%%?status_textarea=%"
-"s)!"
+"Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -1956,8 +2225,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-"Varför inte [registrera ett konto](%%%%action.register%%%%) och bli först "
-"att [posta i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
+"Varför inte [registrera ett konto](%%%%action.register%%%%) och vara först "
+"med att [skriva i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -1984,6 +2253,49 @@ msgstr "Knuff sänd"
msgid "Nudge sent!"
msgstr "Knuff sänd!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Du måste vara inloggad för att lista dina applikationer."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth-applikationer"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Applikationer du har registrerat"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Du har inte registrerat några applikationer än."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Anslutna applikationer"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Du har tillåtit följande applikationer att komma åt ditt konto."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Du är inte en användare av den applikationen."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Kunde inte återkalla åtkomst för applikation: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Du har inte tillåtit några applikationer att använda ditt konto."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Utvecklare kan redigera registreringsinställningarna för sina applikationer "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Notisen har ingen profil"
@@ -2001,8 +2313,8 @@ msgstr "innehållstyp "
msgid "Only "
msgstr "Bara "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -2015,7 +2327,7 @@ msgid "Notice Search"
msgstr "Notissökning"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Övriga inställningar"
#: actions/othersettings.php:71
@@ -2047,29 +2359,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Ingen grupp angiven."
+msgstr "Ingen användar-ID angiven."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Ingen notis angiven."
+msgstr "Ingen inloggnings-token angiven."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Ingen profil-ID i begäran."
+msgstr "Ingen token för inloggning begärd."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Ogiltig eller utgången token."
+msgstr "Ogiltig inloggnings-token angiven."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Logga in på webbplatsen"
+msgstr "Inloggnings-token förfallen."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Utkorg för %1$s - sida %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2141,7 +2453,7 @@ msgstr "Kan inte spara nytt lösenord."
msgid "Password saved."
msgstr "Lösenord sparat."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "Sökvägar"
@@ -2149,133 +2461,149 @@ msgstr "Sökvägar"
msgid "Path and server settings for this StatusNet site."
msgstr "Sökvägs- och serverinställningar för denna StatusNet-webbplats."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Katalog med teman är inte läsbar: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "Katalog med avatarer är inte skrivbar: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "Katalog med bakgrunder är inte skrivbar: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ogiltigt SSL-servernamn. Den maximala längden är 255 tecken."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Webbplats"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Server"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Värdnamn för webbplatsens server."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "Sökväg"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "Sökväg till webbplats"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "Sökväg till lokaliseringfiler (locales)"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Katalogsökväg till lokaliseringfiler (locales)"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Utsmyckade URL:er"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+"Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Teman"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Server med teman"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "Sökväg till teman"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Katalog med teman"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Avatarer"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Server med avatarer"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "Sökväg till avatarer"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Katalog med avatarer"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Bakgrunder"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Server med bakgrunder"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "Sökväg till bakgrunder"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Katalog med bakgrunder"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Aldrig"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Ibland"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Alltid"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "Använd SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "När SSL skall användas"
-#: actions/pathsadminpanel.php:308
-#, fuzzy
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-server"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr "Server att dirigera SSL-förfrågningar till"
+msgstr "Server att dirigera SSL-begäran till"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Spara sökvägar"
@@ -2298,18 +2626,18 @@ msgid "Not a valid people tag: %s"
msgstr "Inte en giltig persontagg: %s"
#: actions/peopletag.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Användare som taggat sig själv med %s - sida %d"
+msgstr "Användare som taggat sig själv med %1$s - sida %2$d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
msgstr "Ogiltigt notisinnehåll"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr "Licensen för notiser ‘%s’ är inte förenlig webbplatslicensen ‘%s’."
+msgstr "Licensen för notiser ‘%1$s’ är inte förenlig webbplatslicensen ‘%2$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2319,8 +2647,8 @@ msgstr "Profilinställningar"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"Du kan uppdatera din personliga profilinformation här så personer får veta "
-"mer om dig."
+"Du kan uppdatera din personliga profilinformation här så att folk vet mer om "
+"dig."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2337,7 +2665,7 @@ msgid "Full name"
msgstr "Fullständigt namn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hemsida"
@@ -2360,7 +2688,7 @@ msgstr "Biografi"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Plats"
@@ -2386,7 +2714,7 @@ msgstr ""
"Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med "
"kommatecken eller mellanslag"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Språk"
@@ -2406,14 +2734,15 @@ msgstr "I vilken tidszon befinner du dig normalt?"
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Prenumerera automatiskt på den prenumererar på mig (bäst för icke-människa) "
+"Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
+"människa) "
#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max %d tecken)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "Tidszon inte valt."
@@ -2426,23 +2755,23 @@ msgstr "Språknamn är för långt (max 50 tecken)."
msgid "Invalid tag: \"%s\""
msgstr "Ogiltig tagg: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Kunde inte spara platsinställningar."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Kunde inte spara profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Kunde inte spara taggar."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Inställningar sparade."
@@ -2464,19 +2793,19 @@ msgstr "Publik tidslinje, sida %d"
msgid "Public timeline"
msgstr "Publik tidslinje"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Publikt flöde av ström (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Publikt flöde av ström (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Publikt flöde av ström (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2485,11 +2814,11 @@ msgstr ""
"Detta är den publika tidslinjen för %%site.name%% men ingen har postat något "
"än."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Bli först att posta!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2497,7 +2826,7 @@ msgstr ""
"Varför inte [registrera ett konto](%%action.register%%) och bli först att "
"posta!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2505,20 +2834,20 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Detta är %%site.name%%, en [mikroblogg](http://en.wikipedia.org/wiki/Micro-"
-"blogging)-tjänst baserad på den fria programvaran [StatusNet](http://status."
+"Detta är %%site.name%%, en [mikroblogg](http://sv.wikipedia.org/wiki/"
+"Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
"net/). [Gå med nu](%%action.register%%) för att dela notiser om dig själv "
"med vänner, familj och kollegor! ([Läs mer](%%doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Detta är %%site.name%%, en [mikroblogg](http://en.wikipedia.org/wiki/Micro-"
-"blogging)-tjänst baserad på den fria programvaran [StatusNet](http://status."
+"Detta är %%site.name%%, en [mikroblogg](http://sv.wikipedia.org/wiki/"
+"Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
"net/)."
#: actions/publictagcloud.php:57
@@ -2548,7 +2877,7 @@ msgstr ""
"Varför inte [registrera ett konto](%%action.register%%) och bli först att "
"posta en!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Taggmoln"
@@ -2679,17 +3008,17 @@ msgstr "Nya lösenordet sparat. Du är nu inloggad."
#: actions/register.php:85 actions/register.php:189 actions/register.php:405
msgid "Sorry, only invited people can register."
-msgstr "Ledsen, bara inbjudna personer kan registrera sig."
+msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
#: actions/register.php:92
msgid "Sorry, invalid invitation code."
-msgstr "Ledsen, ogiltig inbjudningskod."
+msgstr "Tyvärr, ogiltig inbjudningskod."
#: actions/register.php:112
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -2733,7 +3062,7 @@ msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-post"
@@ -2781,6 +3110,20 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
+"Grattis, %1$s! Och välkommen till %%%%site.name%%%%. Härifrån kan du...\n"
+"\n"
+"* Gå till [din profil](%2$s) och skicka ditt första meddelande.\n"
+"* Lägg till en [Jabber/GTalk-adress](%%%%action.imsettings%%%%) så att du "
+"kan skicka notiser via snabbmeddelanden.\n"
+"* [Söka efter personer](%%%%action.peoplesearch%%%%) som du kanske känner "
+"eller som delar dina intressen. \n"
+"* Uppdatera dina [profilinställningar](%%%%action.profilesettings%%%%) för "
+"att berätta mer om dig. \n"
+"* Läs igenom [online-dokumentationen](%%%%doc.help%%%%) för funktioner du "
+"kan ha missat. \n"
+"\n"
+"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
+"denna tjänst."
#: actions/register.php:562
msgid ""
@@ -2827,7 +3170,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Prenumerera"
@@ -2847,7 +3190,7 @@ msgstr "Det där är en lokal profil! Logga in för att prenumerera."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
-msgstr "Kunde inte få en förfrågnings-token."
+msgstr "Kunde inte få en token för begäran."
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
@@ -2865,7 +3208,7 @@ msgstr "Du kan inte upprepa din egna notis."
msgid "You already repeated that notice."
msgstr "Du har redan upprepat denna notis."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Upprepad"
@@ -2879,6 +3222,11 @@ msgstr "Upprepad!"
msgid "Replies to %s"
msgstr "Svarat till %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Svar till %1$s, sida %2$s"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2895,12 +3243,12 @@ msgid "Replies feed for %s (Atom)"
msgstr "Flöde med svar för %s (Atom)"
#: actions/replies.php:198
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
-"Detta är tidslinjen som visar svar till %s men %s har inte tagit emot en "
+"Detta är tidslinjen som visar svar till %s1$ men %2$s har inte tagit emot en "
"notis för dennes uppmärksamhet än."
#: actions/replies.php:203
@@ -2913,19 +3261,23 @@ msgstr ""
"personer eller [gå med i grupper](%%action.groups%%)."
#: actions/replies.php:205
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Du kan prova att [knuffa %s](../%s) eller [posta någonting för hans eller "
-"hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Du kan prova att [knuffa %1$s](../%2$s) eller [posta någonting för hans "
+"eller hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
msgstr "Svar till %1$s på %2$s"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Du kan inte flytta användare till sandlådan på denna webbplats."
@@ -2934,6 +3286,122 @@ msgstr "Du kan inte flytta användare till sandlådan på denna webbplats."
msgid "User is already sandboxed."
msgstr "Användare är redan flyttad till sandlådan."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "Sessioner"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "Sessionsinställningar för denna StatusNet-webbplats."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "Hantera sessioner"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Hurvida sessioner skall hanteras av oss själva."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "Sessionsfelsökning"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Sätt på felsökningsutdata för sessioner."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Spara webbplatsinställningar"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Du måste vara inloggad för att se en applikation."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Applikationsprofil"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Ikon"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Namn"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "Organisation"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beskrivning"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistik"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Skapad av %1$s - %2$s standardåtkomst - %3$d användare"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "Åtgärder för applikation"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Återställ nyckel & hemlighet"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Information om applikation"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Nyckel för konsument"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Hemlighet för konsument"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL för begäran-token"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL för åtkomst-token"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Tillåt URL"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med "
+"klartextsignatur."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+"Är du säker på att du vill återställa din konsumentnyckel och -hemlighet?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%1$ss favoritnotiser, sida %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Kunde inte hämta favoritnotiser."
@@ -2958,6 +3426,9 @@ msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Du har inte valt några favoritnotiser ännu. Klicka på favorit-knappen "
+"bredvid någon notis du skulle vilja bokmärka för senare tillfälle eller för "
+"att sätta strålkastarljuset på."
#: actions/showfavorites.php:207
#, php-format
@@ -2965,6 +3436,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s har inte lagt till några notiser till sina favoriter ännu. Posta något "
+"intressant de skulle lägga till sina favoriter :)"
#: actions/showfavorites.php:211
#, php-format
@@ -2973,27 +3446,35 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s har inte lagt till några notiser till sina favoriter ännu. Varför inte "
+"[registrera ett konto](%%%%action.register%%%%) och posta något intressant "
+"de skulle lägga till sina favoriter :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr "Detta är ett sätt att dela vad du gillar."
+msgstr "Detta är ett sätt att dela med av det du gillar."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
msgstr "%s grupp"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s grupp, sida %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Grupprofil"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "Notis"
@@ -3003,7 +3484,7 @@ msgstr "Alias"
#: actions/showgroup.php:293
msgid "Group actions"
-msgstr "Gruppåtgärder"
+msgstr "Åtgärder för grupp"
#: actions/showgroup.php:328
#, php-format
@@ -3039,10 +3520,6 @@ msgstr "(Ingen)"
msgid "All members"
msgstr "Alla medlemmar"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistik"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Skapad"
@@ -3056,8 +3533,8 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad den fria programvaran "
+"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://sv."
+"wikipedia.org/wiki/Mikroblogg)tjänst baserad den fria programvaran "
"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
"sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en "
"del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))"
@@ -3070,8 +3547,8 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad den fria programvaran "
+"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://sv."
+"wikipedia.org/wiki/Mikroblogg)tjänst baserad den fria programvaran "
"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
"sina liv och intressen. "
@@ -3106,10 +3583,15 @@ msgstr "Notis borttagen."
msgid " tagged %s"
msgstr "taggade %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, sida %2$d"
+
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Flöde av notiser för %s taggade %s (RSS 1.0)"
+msgstr "Flöde av notiser för %1$s taggade %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
@@ -3131,12 +3613,12 @@ msgstr "Flöde av notiser för %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF för %s"
-#: actions/showstream.php:191
-#, fuzzy, php-format
+#: actions/showstream.php:200
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "Detta är tidslinjen för %s men %s har inte postat något än."
+msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3144,16 +3626,16 @@ msgstr ""
"Sett något intressant nyligen? Du har inte postat några notiser än. Varför "
"inte börja nu?"
-#: actions/showstream.php:198
-#, fuzzy, php-format
+#: actions/showstream.php:207
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"Du kan prova att knuffa %s eller [posta något för hans eller hennes "
-"uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Du kan prova att knuffa %1$s eller [posta något för hans eller hennes "
+"uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3161,23 +3643,23 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran "
+"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://sv."
+"wikipedia.org/wiki/Mikroblogg)tjänst baserad på den fria programvaran "
"[StatusNet](http://status.net/). [Gå med nu](%%%%action.register%%%%) för "
"att följa **%s**s notiser och många fler! ([Läs mer](%%%%doc.help%%%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran "
+"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://sv."
+"wikipedia.org/wiki/Mikroblogg)tjänst baserad på den fria programvaran "
"[StatusNet](http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Upprepning av %s"
@@ -3194,208 +3676,152 @@ msgstr "Användaren är redan nedtystad."
msgid "Basic settings for this StatusNet site."
msgstr "Grundinställningar för din StatusNet-webbplats"
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Webbplatsnamnet måste vara minst ett tecken långt."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
-msgstr "Du måste ha en giltig kontakte-postadress"
+msgstr "Du måste ha en giltig e-postadress."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Okänt språk \"%s\""
+msgstr "Okänt språk \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "Ogiltig rapport-URL för ögonblicksbild"
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Ogiltigt körvärde för ögonblicksbild."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "Frekvens för ögonblicksbilder måste vara ett nummer."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Minsta textbegränsning är 140 tecken."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr "Begränsning av duplikat måste vara en eller fler sekuner."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "Allmänt"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Webbplatsnamn"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Namnet på din webbplats, t.ex. \"Företagsnamn mikroblogg\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Tillhandahållen av"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "Text som används för tillskrivningslänkar i sidfoten på varje sida."
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "Tillhandahållen av URL"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL som används för tillskrivningslänkar i sidfoten på varje sida"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Kontakte-postadress för din webbplats"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Lokal"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "Standardtidszon"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "Standardtidzon för denna webbplats; vanligtvis UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Webbplatsens standardspråk"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL:er"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Server"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Värdnamn för webbplatsens server."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Utsmyckade URL:er"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-"Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "Ã…tkomst"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Privat"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-"Skall anonyma användare (inte inloggade) förhindras från att se webbplatsen?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Endast inbjudan"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Gör så att registrering endast sker genom inbjudan."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Stängd"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "Inaktivera nya registreringar."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Ögonblicksbild"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Slumpmässigt vid webbförfrågningar"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "I ett schemalagt jobb"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Ögonblicksbild av data"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "När statistikdata skall skickas till status.net-servrar"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "Frekvens"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Ögonblicksbild kommer skickas var N:te webbträff"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
-msgstr "Rapport-URL"
+msgstr "URL för rapport"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Ögonblicksbild kommer skickat till denna URL"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "Begränsningar"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "Textbegränsning"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "Maximala antalet tecken för notiser."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "Duplikatbegränsning"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Hur länge användare måste vänta (i sekunder) för att posta samma sak igen."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Spara webbplatsinställningar"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "SMS-inställningar"
+msgstr "Inställningar för SMS"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kan ta emot SMS-meddelande genom e-post från %%site.name%%."
+msgstr "Du kan ta emot SMS-meddelanden genom e-post från %%site.name%%."
#: actions/smssettings.php:91
msgid "SMS is not available."
@@ -3418,7 +3844,6 @@ msgid "Enter the code you received on your phone."
msgstr "Fyll i koden du mottog i din telefon."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Telefonnummer för SMS"
@@ -3492,15 +3917,26 @@ msgstr "Ingen kod ifylld"
msgid "You are not subscribed to that profile."
msgstr "Du är inte prenumerat hos den profilen."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Kunde inte spara prenumeration."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Inte en lokal användare."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ingen sådan fil."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Du är inte prenumerat hos den profilen."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Prenumerant"
@@ -3510,9 +3946,9 @@ msgid "%s subscribers"
msgstr "%s prenumeranter"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s prenumeranter, sida %d"
+msgstr "%1$s prenumeranter, sida %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3551,20 +3987,20 @@ msgid "%s subscriptions"
msgstr "%s prenumerationer"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%s prenumerationer, sida %d"
+msgstr "%1$s prenumerationer, sida %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr "Dessa är de personer vars notiser du lyssnar på."
+msgstr "Det är dessa personer vars meddelanden du lyssnar på."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr "Dessa är de personer vars notiser %s lyssnar på."
+msgstr "Det är dessa personer vars notiser %s lyssnar på."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3573,20 +4009,31 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Du lyssnar inte på någons notiser just nu. Prova att prenumerera på personer "
+"du känner. Prova [personsökning] (%%action.peoplesearch%%), leta bland "
+"medlemmar i grupper som intresserad dig och bland våra [profilerade "
+"användare] (%%action.featured%%). Om du är en [Twitter-användare] (%%action."
+"twittersettings%%) kan du prenumerera automatiskt på personer som du redan "
+"följer där."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s lyssnar inte på någon."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Notiser taggade med %1$s, sida %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3615,7 +4062,8 @@ msgstr "Tagg %s"
msgid "User profile"
msgstr "Användarprofil"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Foto"
@@ -3675,13 +4123,13 @@ msgstr "Ingen profil-ID i begäran."
msgid "Unsubscribed"
msgstr "Prenumeration avslutad"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
-#, fuzzy, php-format
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
+#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Licensen för lyssnarströmmen '%s' är inte förenlig med webbplatslicensen '%"
-"s'."
+"Licensen för lyssnarströmmen '%1$s' är inte förenlig med webbplatslicensen '%"
+"2$s'."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
@@ -3692,86 +4140,66 @@ msgstr "Användare"
msgid "User settings for this StatusNet site."
msgstr "Användarinställningar för denna StatusNet-webbplats"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Ogiltig begränsning av biografi. Måste vara numerisk."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "Begränsning av biografi"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "Maximal teckenlängd av profilbiografi."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Nya användare"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "Välkomnande av ny användare"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Välkomsttext för nya användare (max 255 tecken)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Standardprenumerationer"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr ""
"Lägg automatiskt till en prenumeration på denna användare för alla nya "
"användare."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Inbjudningar"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Inbjudningar aktiverade"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "Sessioner"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "Hantera sessioner"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Hurvida sessioner skall hanteras av oss själva."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "Sessionsfelsökning"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Sätt på felsökningsutdata för sessioner."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Godkänn prenumeration"
@@ -3786,50 +4214,50 @@ msgstr ""
"prenumerera på den här användarens notiser. Om du inte bett att prenumerera "
"på någons meddelanden, klicka på \"Avvisa\"."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "Licens"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Acceptera"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "Prenumerera på denna användare"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Avvisa"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Avvisa denna prenumeration"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr "Ingen auktoriseringsförfrågan!"
+msgstr "Ingen begäran om godkännande!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Prenumeration godkänd"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
+"Prenumerationen har godkänts, men ingen anrops-URL har gått igenom. Kolla "
"med webbplatsens instruktioner hur du bekräftar en prenumeration. Din "
"prenumerations-token är:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Prenumeration avvisad"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3839,37 +4267,37 @@ msgstr ""
"webbplatsens instruktioner för detaljer om hur du fullständingt avvisar "
"prenumerationen."
-#: actions/userauthorization.php:296
-#, fuzzy, php-format
+#: actions/userauthorization.php:303
+#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr "Lyssnar-URI '%s' hittades inte här"
+msgstr "URI för lyssnare '%s' hittades inte här."
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "Lyssnar-URI '%s' är för lång."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "Lyssnar-URI '%s' är en lokal användare."
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "Profil-URL ‘%s’ är för en lokal användare."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "Avatar-URL ‘%s’ är inte giltig."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Kan inte läsa avatar-URL '%s'."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Fel bildtyp för avatar-URL '%s'."
@@ -3889,6 +4317,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "Smaklig måltid!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s grupper, sida %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Sök efter fler grupper"
@@ -3905,9 +4338,9 @@ msgstr ""
"Prova att [söka efter grupper](%%action.groupsearch%%) och gå med i dem."
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "Statistik"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -3915,15 +4348,12 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Status borttagen."
+"Denna webbplats drivs med %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. och medarbetare."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Medarbetare"
#: actions/version.php:168
msgid ""
@@ -3932,6 +4362,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet är fri programvara: du kan distribuera det och/eller modifiera den "
+"under GNU Affero General Public License såsom publicerad av Free Software "
+"Foundation, antingen version 3 av licensen, eller (utifrån ditt val) någon "
+"senare version. "
#: actions/version.php:174
msgid ""
@@ -3940,6 +4374,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Detta program distribueras i hopp om att det kommer att vara användbart, men "
+"UTAN NÅGRA GARANTIER; även utan underförstådda garantier om SÄLJBARHET eller "
+"LÄMPLIGHET FÖR ETT SÄRSKILT ÄNDAMÅL. Se GNU Affero General Public License "
+"för mer information. "
#: actions/version.php:180
#, php-format
@@ -3947,30 +4385,21 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Du bör ha fått en kopia av GNU Affero General Public License tillsammans med "
+"detta program. Om inte, se %s."
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
+msgstr "Insticksmoduler"
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Smeknamn"
-
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "Sessioner"
+msgstr "Version"
#: actions/version.php:197
-#, fuzzy
msgid "Author(s)"
msgstr "Författare"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beskrivning"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3991,19 +4420,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Grupprofil"
+msgstr "Gruppanslutning misslyckades."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Kunde inte uppdatera grupp."
+msgstr "Inte med i grupp."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Grupprofil"
+msgstr "Grupputträde misslyckades."
#: classes/Login_token.php:76
#, php-format
@@ -4022,27 +4448,27 @@ msgstr "Kunde inte infoga meddelande."
msgid "Could not update message with new URI."
msgstr "Kunde inte uppdatera meddelande med ny URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Databasfel vid infogning av hashtag: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Problem vid sparande av notis. För långt."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem vid sparande av notis. Okänd användare."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"För många notiser för snabbt; ta en vilopaus och posta igen om ett par "
"minuter."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4050,34 +4476,57 @@ msgstr ""
"För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen "
"om ett par minuter."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Du är utestängd från att posta notiser på denna webbplats."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Databasfel vid infogning av svar: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Problem med att spara gruppinkorg."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Du har blivit utestängd från att prenumerera."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Redan prenumerant!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Användaren har blockerat dig."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Inte prenumerant!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Kunde inte ta bort själv-prenumeration."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Kunde inte ta bort prenumeration."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Välkommen till %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Kunde inte skapa grupp."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Kunde inte ställa in gruppmedlemskap."
@@ -4110,196 +4559,214 @@ msgid "Other options"
msgstr "Övriga alternativ"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Namnlös sida"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Hem"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Konto"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Ändra din e-post, avatar, lösenord, profil"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Anslut"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Anslut till tjänster"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjud in"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Logga ut"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Skapa ett konto"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjälp"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Sök"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Webbplatsnotis"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokala vyer"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Sidnotis"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Om"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "Frågor & svar"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "Användarvillkor"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Sekretess"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Källa"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Emblem"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
"**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby"
-"%%](%%site.broughtbyurl%%)"
+"%%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** är en mikrobloggtjänst."
+msgstr "**%%site.name%%** är en mikrobloggtjänst. "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Den drivs med mikroblogg-programvaran [StatusNet](http://status.net/), "
+"Den drivs med mikrobloggprogramvaran [StatusNet](http://status.net/), "
"version %s, tillgänglig under [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Innehåll och data av %1$s är privat och konfidensiell."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
+
+#: lib/action.php:827
msgid "All "
msgstr "Alla "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "licens."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Senare"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Tidigare"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Det var ett problem med din sessions-token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Du kan inte göra förändringar av denna webbplats."
#: lib/adminpanelaction.php:107
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "Registrering inte tillåten."
+msgstr "Ändringar av den panelen tillåts inte."
#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
@@ -4321,10 +4788,100 @@ msgstr "Grundläggande webbplatskonfiguration"
msgid "Design configuration"
msgstr "Konfiguration av utseende"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "Konfiguration av användare"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "Konfiguration av åtkomst"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Konfiguration av sökvägar"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "Konfiguration av sessioner"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"Misslyckat försök till API-autentisering, smeknamn =%1$s, proxy =%2$s, ip =%3"
+"$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Redigera applikation"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Ikon för denna applikation"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Beskriv din applikation med högst %d tecken"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Beskriv din applikation"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL för källa"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL till hemsidan för denna applikation"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organisation som ansvarar för denna applikation"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL till organisationens hemsidan"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL att omdirigera till efter autentisering"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Webbläsare"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "Skrivbord"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Typ av applikation, webbläsare eller skrivbord"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Skrivskyddad"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Läs och skriv"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Ã…terkalla"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Bilagor"
@@ -4345,11 +4902,11 @@ msgstr "Notiser där denna bilaga förekommer"
msgid "Tags for this attachment"
msgstr "Taggar för denna billaga"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Byte av lösenord misslyckades"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Byte av lösenord är inte tillåtet"
@@ -4367,7 +4924,7 @@ msgstr "Kommando misslyckades"
#: lib/command.php:44
msgid "Sorry, this command is not yet implemented."
-msgstr "Ledsen, detta kommando är inte implementerat än."
+msgstr "Tyvärr, detta kommando är inte implementerat än."
#: lib/command.php:88
#, php-format
@@ -4500,81 +5057,91 @@ msgstr "Fel vid sparande av notis."
msgid "Specify the name of the user to subscribe to"
msgstr "Ange namnet på användaren att prenumerara på"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Ingen sådan användare."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Prenumerar på %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Ange namnet på användaren att avsluta prenumeration på"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Prenumeration hos %s avslutad"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Kommando inte implementerat än."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notifikation av."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Kan inte sätta på notifikation."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notifikation på."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Kan inte stänga av notifikation."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Inloggningskommando är inaktiverat"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Prenumeration hos %s avslutad"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Du prenumererar inte på någon."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du prenumererar på denna person:"
msgstr[1] "Du prenumererar på dessa personer:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "Ingen prenumerar på dig."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Denna person prenumererar på dig:"
msgstr[1] "Dessa personer prenumererar på dig:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Du är inte medlem i några grupper."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du är en medlem i denna grupp:"
msgstr[1] "Du är en medlem i dessa grupper:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4588,6 +5155,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4614,26 +5182,63 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
-
-#: lib/common.php:131
+"Kommandon:\n"
+"on - sätt på notifikationer\n"
+"off - stäng av notifikationer\n"
+"help - visa denna hjälp\n"
+"follow <smeknamn> - prenumerera på användare\n"
+"groups - lista grupperna du tillhör\n"
+"subscriptions - lista personerna du följer\n"
+"subscribers - lista personerna som följer dig\n"
+"leave <smeknamn> - avsluta prenumeration på användare\n"
+"d <smeknamn> <text> - direktmeddelande till användare\n"
+"get <smeknamn> - hämta senaste notis från användare\n"
+"whois <smeknamn> - hämta profilinformation om användare\n"
+"fav <smeknamn> - lägg till användarens senaste notis som favorit\n"
+"fav #<notisid> - lägg till notis med given id som favorit\n"
+"repeat #<notisid> - upprepa en notis med en given id\n"
+"repeat <smeknamn> - upprepa den senaste notisen från användare\n"
+"reply #<notisid> - svara på notis med en given id\n"
+"reply <smeknamn> - svara på den senaste notisen från användare\n"
+"join <grupp> - gå med i grupp\n"
+"login - hämta en länk till webbgränssnittets inloggningssida\n"
+"drop <grupp> - lämna grupp\n"
+"stats - hämta din statistik\n"
+"stop - samma som 'off'\n"
+"quit - samma som 'off'\n"
+"sub <smeknamn> - samma som 'follow'\n"
+"unsub <smeknamn> - samma som 'leave'\n"
+"last <smeknamn> - samma som 'get'\n"
+"on <smeknamn> - inte implementerat än.\n"
+"off <smeknamn> - inte implementerat än.\n"
+"nudge <smeknamn> - påminn en användare om att uppdatera\n"
+"invite <telefonnummer> - inte implementerat än.\n"
+"track <ord> - inte implementerat än.\n"
+"untrack <ord> - inte implementerat än.\n"
+"track off - inte implementerat än.\n"
+"untrack all - inte implementerat än.\n"
+"tracks - inte implementerat än.\n"
+"tracking - inte implementerat än.\n"
+
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ingen konfigurationsfil hittades. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Jag letade efter konfigurationsfiler på följande platser: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Du kanske vill köra installeraren för att åtgärda detta."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "GÃ¥ till installeraren."
#: lib/connectsettingsaction.php:110
msgid "IM"
-msgstr "IM"
+msgstr "Snabbmeddelande"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
@@ -4643,6 +5248,14 @@ msgstr "Uppdateringar via snabbmeddelande (IM)"
msgid "Updates by SMS"
msgstr "Uppdateringar via SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Anslutningar"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Tillåt anslutna applikationer"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Databasfel"
@@ -4827,15 +5440,15 @@ msgstr "MB"
msgid "kB"
msgstr "kB"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Okänt språk \"%s\""
+msgstr "Okänd källa för inkorg %d."
#: lib/joinform.php:114
msgid "Join"
@@ -4873,6 +5486,18 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Hej %s!\n"
+"\n"
+"Någon la precis till den här e-postadressen på %s.\n"
+"\n"
+"Om det var du och du vill bekräfta det, använd webbadressen nedan:\n"
+"\n"
+"%s\n"
+"\n"
+"Om inte, ignorera bara det här meddelandet.\n"
+"\n"
+"Tack för din tid, \n"
+"%s\n"
#: lib/mail.php:236
#, php-format
@@ -4893,13 +5518,21 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s lyssnar nu på dina notiser på %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Med vänliga hälsningar,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Ändra din e-postadress eller notiferingsinställningar på %8$s\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Biografi: %s\n"
-"\n"
+msgstr "Biografi: %s"
#: lib/mail.php:286
#, php-format
@@ -4956,6 +5589,17 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) undrar vad du håller på med nuförtiden och inbjuder dig att "
+"lägga upp några nyheter.\n"
+"\n"
+"Så låt oss höra av dig :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Svara inte på det här e-postmeddelandet; det kommer inte komma fram.\n"
+"\n"
+"Med vänliga hälsningar,\n"
+"%4$s\n"
#: lib/mail.php:510
#, php-format
@@ -4980,6 +5624,20 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) skickade ett privat meddelande till dig:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Du kan svara på meddelandet här:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Svara inte på detta e-postmeddelande; det kommer inte komma fram.\n"
+"\n"
+"Med vänliga hälsningar,\n"
+"%5$s\n"
#: lib/mail.php:559
#, php-format
@@ -5006,6 +5664,22 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) la precis till din notis från %2$s som en av sina favoriter.\n"
+"\n"
+"Webbadressen för din notis är:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Texten i din notis är:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan se listan med %1$ss favoriter här:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Med vänliga hälsningar,\n"
+"%6$s\n"
#: lib/mail.php:624
#, php-format
@@ -5026,6 +5700,17 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) skickade precis en notis för din uppmärksamhet (ett '@-svar') "
+"på %2$s.\n"
+"\n"
+"Notisen är här:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Den lyder:\n"
+"\n"
+"%4$s\n"
+"\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -5040,7 +5725,7 @@ msgstr ""
"engagera andra användare i konversationen. Folk kan skicka meddelanden till "
"dig som bara du ser."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "från"
@@ -5054,16 +5739,16 @@ msgstr "Inte en registrerad användare."
#: lib/mailhandler.php:46
msgid "Sorry, that is not your incoming email address."
-msgstr "Ledsen, det är inte din inkommande e-postadress."
+msgstr "Tyvärr, det är inte din inkommande e-postadress."
#: lib/mailhandler.php:50
msgid "Sorry, no incoming email allowed."
-msgstr "Ledsen, ingen inkommande e-post tillåts."
+msgstr "Tyvärr, ingen inkommande e-post tillåts."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Bildfilens format stödjs inte."
+msgstr "Formatet %s för meddelande stödjs inte."
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
@@ -5100,18 +5785,16 @@ msgid "File upload stopped by extension."
msgstr "Filuppladdningen stoppad pga filändelse"
#: lib/mediafile.php:179 lib/mediafile.php:216
-#, fuzzy
msgid "File exceeds user's quota."
-msgstr "Fil överstiger användaren kvot!"
+msgstr "Fil överstiger användaren kvot."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
msgstr "Fil kunde inte flyttas till destinationskatalog."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Kunde inte fastställa filens MIME-typ!"
+msgstr "Kunde inte fastställa filens MIME-typ."
#: lib/mediafile.php:270
#, php-format
@@ -5119,13 +5802,13 @@ msgid " Try using another %s format."
msgstr "Försök använda ett annat %s-format."
#: lib/mediafile.php:275
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a supported file type on this server."
msgstr "%s är en filtyp som saknar stöd på denna server."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr "Skicka ett direktinlägg"
+msgstr "Skicka en direktnotis"
#: lib/messageform.php:146
msgid "To"
@@ -5137,7 +5820,7 @@ msgstr "Tillgängliga tecken"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "Skicka ett inlägg"
+msgstr "Skicka en notis"
#: lib/noticeform.php:173
#, php-format
@@ -5153,67 +5836,63 @@ msgid "Attach a file"
msgstr "Bifoga en fil"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Dela din plats"
+msgstr "Dela min plats"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Dela din plats"
+msgstr "Dela inte min plats"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Tyvärr, hämtning av din geografiska plats tar längre tid än förväntat, var "
+"god försök igen senare"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "Ö"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "V"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "på"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "i sammanhang"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Upprepad av"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
-msgstr "Svara på detta inlägg"
+msgstr "Svara på denna notis"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Notis upprepad"
@@ -5227,7 +5906,7 @@ msgstr "Knuffa"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr "Skicka en knuff till den användaren."
+msgstr "Skicka en knuff till denna användare"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
@@ -5243,19 +5922,15 @@ msgstr "Fel vid infogning av fjärrprofilen"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr "Duplicera notis"
-
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Du har blivit utestängd från att prenumerera."
+msgstr "Duplicerad notis"
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Kunde inte infoga ny prenumeration."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
#: lib/personalgroupnav.php:104
msgid "Replies"
@@ -5265,19 +5940,19 @@ msgstr "Svar"
msgid "Favorites"
msgstr "Favoriter"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Inkorg"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Dina inkommande meddelanden"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Utkorg"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Dina skickade meddelanden"
@@ -5287,9 +5962,8 @@ msgid "Tags in %s's notices"
msgstr "Taggar i %ss notiser"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "Okänd funktion"
+msgstr "Okänd"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -5329,7 +6003,7 @@ msgstr "Inte implementerad metod."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr "Publik"
+msgstr "Publikt"
#: lib/publicgroupnav.php:82
msgid "User groups"
@@ -5353,7 +6027,11 @@ msgstr "Upprepa denna notis?"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr "Upprepa detta inlägg"
+msgstr "Upprepa denna notis"
+
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "Ingen enskild användare definierad för enanvändarläge."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -5422,43 +6100,15 @@ msgstr "Personer som prenumererar på %s"
msgid "Groups %s is a member of"
msgstr "Grupper %s är en medlem i"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Redan prenumerant!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Användaren har blockerat dig."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Kunde inte prenumerera."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Kunde inte göra andra till prenumeranter hos dig."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Inte prenumerant!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Kunde inte ta bort själv-prenumeration."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Kunde inte ta bort prenumeration."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Taggmoln för person, såsom taggat själv"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Taggmoln för person, såsom taggats"
#: lib/tagcloudsection.php:56
msgid "None"
@@ -5498,69 +6148,69 @@ msgstr "Redigera avatar"
#: lib/userprofile.php:236
msgid "User actions"
-msgstr "Användaråtgärd"
+msgstr "Åtgärder för användare"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Redigera profilinställningar"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Redigera"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Skicka ett direktmeddelande till denna användare"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Meddelande"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderera"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -5574,7 +6224,7 @@ msgstr "%s är inte en giltig färg!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
-#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#: lib/xmppmanager.php:402
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d"
+msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 72ed8daaf..09ede3d86 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,17 +8,72 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:12+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:47+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "అంగీకరించà±"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "సైటౠఅందà±à°¬à°¾à°Ÿà± అమరికలà±"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "నమోదà±"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "అంతరంగికం"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "à°…à°œà±à°žà°¾à°¤ (à°ªà±à°°à°µà±‡à°¶à°¿à°‚చని) వాడà±à°•à°°à±à°²à°¨à°¿ సైటà±à°¨à°¿ చూడకà±à°‚à°¡à°¾ నిషేధించాలా?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à°•ౠమాతà±à°°à°®à±‡"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మాతà±à°°à°®à±‡ నమోదౠఅవà±à°µà°—లిగేలా చెయà±à°¯à°¿."
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "కొతà±à°¤ నమోదà±à°²à°¨à± అచేతనంచేయి."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "à°­à°¦à±à°°à°ªà°°à°šà±"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -33,25 +88,29 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s మరియౠమితà±à°°à±à°²à±, పేజీ %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,7 +151,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -103,8 +162,8 @@ msgstr ""
msgid "You and friends"
msgstr "మీరౠమరియౠమీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à±"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -114,23 +173,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±."
@@ -145,7 +204,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -176,8 +235,9 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -244,7 +304,7 @@ msgstr "చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à°  సందేà°
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
-msgstr ""
+msgstr "à°…à°‚à°¦à±à°•ోవాలà±à°¸à°¿à°¨ వాడà±à°•à°°à°¿ కనబడలేదà±."
#: actions/apidirectmessagenew.php:150
msgid "Can't send direct messages to users who aren't your friend."
@@ -256,18 +316,16 @@ msgid "No status found with that ID."
msgstr ""
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•ే మీ ఇషà±à°Ÿà°¾à°‚à°¶à°‚!"
+msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•ే మీ ఇషà±à°Ÿà°¾à°‚à°¶à°‚."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "à°† నోటీసౠఇషà±à°Ÿà°¾à°‚à°¶à°‚ కాదà±!"
+msgstr "à°† నోటీసౠఇషà±à°Ÿà°¾à°‚à°¶à°‚ కాదà±."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -275,12 +333,12 @@ msgstr "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ తొలగించలేకపà±
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
-msgstr ""
+msgstr "వాడà±à°•రిని à°…à°¨à±à°¸à°°à°¿à°‚చలేకపోయాం: వాడà±à°•à°°à°¿ కనబడలేదà±."
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "వాడà±à°•రిని à°…à°¨à±à°¸à°°à°¿à°‚చలేకపోయాం: %s ఇపà±à°ªà°Ÿà°¿à°•ే మీ జాబితాలో ఉనà±à°¨à°¾à°°à±."
#: actions/apifriendshipsdestroy.php:109
#, fuzzy
@@ -296,12 +354,12 @@ msgstr "మిమà±à°®à°²à±à°¨à°¿ మీరే నిరోధించà±à°•à
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "వాడà±à°•రిని తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "లకà±à°·à±à°¯à°¿à°¤ వాడà±à°•రిని à°•à°¨à±à°—ొనలేకపోయాం."
@@ -323,7 +381,8 @@ msgstr "à°† పేరà±à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•ే వాడà±à°¤à±à°¨à±
msgid "Not a valid nickname."
msgstr "సరైన పేరౠకాదà±."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -335,7 +394,8 @@ msgstr "హోమౠపేజీ URL సరైనది కాదà±."
msgid "Full name is too long (max 255 chars)."
msgstr "పూరà±à°¤à°¿ పేరౠచాలా పెదà±à°¦à°—à°¾ ఉంది (à°—à°°à°¿à°·à±à° à°‚à°—à°¾ 255 à°…à°•à±à°·à°°à°¾à°²à±)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "వివరణ చాలా పెదà±à°¦à°—à°¾ ఉంది (%d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
@@ -371,7 +431,7 @@ msgstr "మారà±à°ªà±‡à°°à± పేరà±à°¤à±‹ సమానంగా ఉం
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "à°—à±à°‚పౠదొరకలేదà±!"
@@ -412,6 +472,113 @@ msgstr "%s à°—à±à°‚à°ªà±à°²à±"
msgid "groups on %s"
msgstr "%s పై à°—à±à°‚à°ªà±à°²à±"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "తపà±à°ªà±à°¡à± పరిమాణం."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "తపà±à°ªà±à°¡à± పేరౠ/ సంకేతపదం!"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "అవతారానà±à°¨à°¿ పెటà±à°Ÿà°¡à°‚లో పొరపాటà±"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "అవతారానà±à°¨à°¿ పెటà±à°Ÿà°¡à°‚లో పొరపాటà±"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "ఖాతా"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "పేరà±"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "సంకేతపదం"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "తిరసà±à°•à°°à°¿à°‚à°šà±"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "à°…à°¨à±à°®à°¤à°¿à°‚à°šà±"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -426,14 +593,12 @@ msgid "No such notice."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±."
#: actions/apistatusesretweet.php:83
-#, fuzzy
msgid "Cannot repeat your own notice."
-msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•ోలేరà±."
+msgstr "మీ నోటీసà±à°¨à°¿ మీరే à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చలేరà±."
#: actions/apistatusesretweet.php:91
-#, fuzzy
msgid "Already repeated that notice."
-msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±"
+msgstr "ఇపà±à°ªà°Ÿà°¿à°•ే à°† నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చారà±."
#: actions/apistatusesshow.php:138
msgid "Status deleted."
@@ -443,17 +608,17 @@ msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "అది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à°  నోటీసౠపరిమాణం %d à°…à°•à±à°·à°°à°¾à°²à±."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "దొరకలేదà±"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "à°—à°°à°¿à°·à±à°  నోటీసౠపొడవౠ%d à°…à°•à±à°·à°°à°¾à°²à±, జోడింపౠURLని à°•à°²à±à°ªà±à°•à±à°¨à°¿."
@@ -467,7 +632,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±"
@@ -478,7 +643,7 @@ msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±"
msgid "%s timeline"
msgstr "%s కాలరేఖ"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -494,37 +659,32 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s బహిరంగ కాలరేఖ"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr ""
-
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
+msgstr "అందరి à°¨à±à°‚à°¡à°¿ %s తాజాకరణలà±!"
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
-#: actions/apitimelineretweetsofme.php:112
-#, fuzzy, php-format
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
msgid "Repeats of %s"
-msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
+msgstr "%s యొకà±à°• à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¾à°²à±"
#: actions/apitimelinetag.php:102 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±"
@@ -585,8 +745,8 @@ msgstr "అసలà±"
msgid "Preview"
msgstr "à°®à±à°¨à±à°œà±‚à°ªà±"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "తొలగించà±"
@@ -598,29 +758,6 @@ msgstr "à°Žà°—à±à°®à°¤à°¿à°‚à°šà±"
msgid "Crop"
msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "మీ అవతారానికి గానూ à°ˆ à°šà°¿à°¤à±à°°à°‚ à°¨à±à°‚à°¡à°¿ à°’à°• à°šà°¤à±à°°à°¸à±à°°à°ªà± à°ªà±à°°à°¦à±‡à°¶à°¾à°¨à±à°¨à°¿ à°Žà°‚à°šà±à°•ోండి"
@@ -656,8 +793,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "కాదà±"
@@ -665,13 +803,13 @@ msgstr "కాదà±"
msgid "Do not block this user"
msgstr "à°ˆ వాడà±à°•రిని నిరోధించకà±"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "à°…à°µà±à°¨à±"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "à°ˆ వాడà±à°•రిని నిరోధించà±"
@@ -756,7 +894,7 @@ msgid "Couldn't delete email confirmation."
msgstr "ఈమెయిలౠనిరà±à°§à°¾à°°à°£à°¨à°¿ తొలగించలేకà±à°¨à±à°¨à°¾à°‚."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "à°šà°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ నిరà±à°§à°¾à°°à°¿à°‚à°šà±"
#: actions/confirmaddress.php:159
@@ -773,10 +911,50 @@ msgstr "సంభాషణ"
msgid "Notices"
msgstr "సందేశాలà±"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "ఉపకరణాలని తొలగించడానికి మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "ఉపకరణం కనబడలేదà±."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "మీరౠఈ ఉపకరణం యొకà±à°• యజమాని కాదà±."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "ఉపకరణ తొలగింపà±"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"మీరౠనిజంగానే à°ˆ ఉపకరణానà±à°¨à°¿ తొలగించాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à°¾? ఇది à°† ఉపకరణం à°—à±à°°à°¿à°‚à°šà°¿ భోగటà±à°Ÿà°¾à°¨à°¿, à°ªà±à°°à°¸à±à°¤à±à°¤ "
+"వాడà±à°•à°°à±à°² à°…à°¨à±à°¸à°‚ధానాలతో సహా, డాటాబేసౠనà±à°‚à°¡à°¿ తొలగిసà±à°¤à±à°‚ది."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "à°ˆ ఉపకరణానà±à°¨à°¿ తొలగించకà±"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "à°ˆ ఉపకరణానà±à°¨à°¿ తొలగించà±"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -805,7 +983,7 @@ msgstr "మీరౠనిజంగానే à°ˆ నోటీసà±à°¨à°¿ à°¤à±
msgid "Do not delete this notice"
msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించకà±"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±"
@@ -840,7 +1018,7 @@ msgstr "రూపà±à°°à±‡à°–à°²à±"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటౠసైటà±à°•à°¿ రూపà±à°°à±‡à°–à°² అమరికలà±."
#: actions/designadminpanel.php:275
msgid "Invalid logo URL."
@@ -935,16 +1113,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "à°­à°¦à±à°°à°ªà°°à°šà±"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "రూపà±à°°à±‡à°–లని à°­à°¦à±à°°à°ªà°°à°šà±"
@@ -957,10 +1125,80 @@ msgstr "à°ˆ నోటీసౠఇషà±à°Ÿà°¾à°‚à°¶à°‚ కాదà±!"
msgid "Add to favorites"
msgstr "ఇషà±à°Ÿà°¾à°‚శాలకౠచేరà±à°šà±"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "ఉపకరణానà±à°¨à°¿ మారà±à°šà±"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "ఉపకరణాలని మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ ఉపకరణం లేదà±."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "మీ ఉపకరణానà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ à°ˆ ఫారానà±à°¨à°¿ ఉపయోగించండి."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "పేరౠతపà±à°ªà°¨à°¿à°¸à°°à°¿."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "పేరౠచాలా పెదà±à°¦à°—à°¾ ఉంది (à°—à°°à°¿à°·à±à° à°‚à°—à°¾ 255 à°…à°•à±à°·à°°à°¾à°²à±)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "à°† పేరà±à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•ే వాడà±à°¤à±à°¨à±à°¨à°¾à°°à±. మరోటి à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "వివరణ తపà±à°ªà°¨à°¿à°¸à°°à°¿."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "హోమౠపేజీ URL సరైనది కాదà±."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "సంసà±à°¥ తపà±à°ªà°¨à°¿à°¸à°°à°¿."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "సంసà±à°¥ పేరౠమరీ పెదà±à°¦à°—à°¾ ఉంది (255 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -988,7 +1226,7 @@ msgstr "వివరణ చాలా పెదà±à°¦à°¦à°¿à°—à°¾ ఉంది (1
msgid "Could not update group."
msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "మారà±à°ªà±‡à°°à±à°²à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
@@ -1027,7 +1265,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
@@ -1107,7 +1346,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±:"
@@ -1119,7 +1358,7 @@ msgstr "అది ఇపà±à°ªà°Ÿà°¿à°•ే మీ ఈమెయిలౠచిà°
msgid "That email address already belongs to another user."
msgstr "à°† ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఇపà±à°ªà°Ÿà±‡à°•ే ఇతర వాడà±à°•à°°à°¿à°•à°¿ సంబంధించినది."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "నిరà±à°§à°¾à°°à°£ సంకేతానà±à°¨à°¿ చేరà±à°šà°²à±‡à°•పోయాం."
@@ -1178,7 +1417,7 @@ msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•ే మీ ఇషà±à°Ÿà°¾à°
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯ నోటీసà±à°²à±"
@@ -1233,7 +1472,7 @@ msgstr "విశేష వాడà±à°•à°°à±à°²à±, పేజీ %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "%sలో కొందరౠగొపà±à°ª వాడà±à°•à°°à±à°² యొకà±à°• ఎంపిక"
#: actions/file.php:34
#, fuzzy
@@ -1270,7 +1509,7 @@ msgstr "à°† వాడà±à°•à°°à°¿ మిమà±à°®à°²à±à°¨à°¿ చందాచే
#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
-msgstr ""
+msgstr "మీకౠఅధీకరణ లేదà±."
#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
@@ -1321,7 +1560,7 @@ msgstr "వాడà±à°•రిని ఇపà±à°ªà°Ÿà°¿à°•ే à°—à±à°‚à°ªà±à°¨à
msgid "User is not a member of group."
msgstr "వాడà±à°•à°°à°¿ à°ˆ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "వాడà±à°•రిని à°—à±à°‚పౠనà±à°‚à°¡à°¿ నిరోధించà±"
@@ -1332,6 +1571,8 @@ msgid ""
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
+"నిజంగానే వాడà±à°•à°°à°¿ \"%1$s\"ని \"%2$s\" à°—à±à°‚పౠనà±à°‚à°¡à°¿ నిరోధించాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à°¾? వారిని à°—à±à°‚పౠనà±à°‚à°¡à°¿ "
+"తొలగిసà±à°¤à°¾à°‚, ఇక భవిషà±à°¯à°¤à±à°¤à±à°²à±‹ వారౠగà±à°‚à°ªà±à°²à±‹ à°ªà±à°°à°šà±à°°à°¿à°‚చలేరà±, మరియౠగà±à°‚à°ªà±à°•à°¿ చందాచేరలేరà±."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1407,31 +1648,31 @@ msgid "%s group members"
msgstr "%s à°—à±à°‚పౠసభà±à°¯à±à°²à±"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "%s à°—à±à°‚పౠసభà±à°¯à±à°²à±, పేజీ %d"
+msgstr "%1$s à°—à±à°‚పౠసభà±à°¯à±à°²à±, పేజీ %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr "à°ˆ à°—à±à°‚à°ªà±à°²à±‹ వాడà±à°•à°°à±à°²à± జాబితా."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "నిరోధించà±"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "వాడà±à°•రిని à°—à±à°‚à°ªà±à°•à°¿ à°’à°• నిరà±à°µà°¾à°¹à°•à±à°¨à°¿à°—à°¾ చేయి"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "నిరà±à°µà°¾à°¹à°•à±à°¨à±à°¨à°¿ చేయి"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "à°ˆ వాడà±à°•రిని నిరà±à°µà°¾à°¹à°•à±à°¨à±à°¨à°¿ చేయి"
@@ -1459,6 +1700,10 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"ఒకే రకమైన ఆసకà±à°¤à±à°²à± ఉనà±à°¨ à°µà±à°¯à°•à±à°¤à±à°²à± à°•à°²à±à°¸à±à°•ోడానికి మరియౠమాటà±à°²à°¾à°¡à±à°•ోడానికి %%%%site.name%%%% "
+"à°—à±à°‚à°ªà±à°²à± వీలà±à°•à°²à±à°ªà°¿à°¸à±à°¤à°¾à°¯à°¿. à°’à°• à°—à±à°‚à°ªà±à°²à±‹ చేరిన తరà±à°µà°¾à°¤ మీరౠ\"!groupname\" à°…à°¨à±à°¨ సంకేతం à°¦à±à°µà°¾à°°à°¾ à°† "
+"à°—à±à°‚పౠలోని సభà±à°¯à±à°²à°‚దరికీ సందేశాలని పంపించవచà±à°šà±. మీకౠనచà±à°šà°¿à°¨ à°—à±à°‚పౠకనబడలేదా? [దాని కోసం వెతకండి](%%"
+"%%action.groupsearch%%%%) లేదా [మీరే కొతà±à°¤à°¦à°¿ సృషà±à°Ÿà°¿à°‚à°šà°‚à°¡à°¿!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1496,6 +1741,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"[à°’à°• ఖాతాని నమోదà±à°šà±‡à°¸à±à°•à±à°¨à°¿](%%action.register%%) మీరే à°Žà°‚à°¦à±à°•à± [à°† à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚à°š](%%"
+"action.newgroup%%)కూడదà±!"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
@@ -1593,6 +1840,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "ఇది మీ Jabber ID కాదà±"
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%sà°•à°¿ వచà±à°šà°¿à°¨à°µà°¿"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1651,7 +1903,7 @@ msgstr ""
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+msgstr "à°ˆ ఫారానà±à°¨à°¿ ఉపయోగించి మీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à°¨à± మరియౠసహోదà±à°¯à±‹à°—à±à°²à°¨à± à°ˆ సేవనౠవినియోగించà±à°•ోమని ఆహà±à°µà°¾à°¨à°¿à°‚à°šà°‚à°¡à°¿."
#: actions/invite.php:187
msgid "Email addresses"
@@ -1669,7 +1921,7 @@ msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ సందేశం"
msgid "Optionally add a personal message to the invitation."
msgstr "à°à°šà±à°›à°¿à°•à°‚à°—à°¾ ఆహà±à°µà°¾à°¨à°¾à°¨à°¿à°•à°¿ à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ సందేశం చేరà±à°šà°‚à°¡à°¿."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "పంపించà±"
@@ -1743,7 +1995,7 @@ msgstr "వాడà±à°•రిపేరౠలేదా సంకేతపదం
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
@@ -1752,17 +2004,6 @@ msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
msgid "Login to site"
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "పేరà±"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "సంకేతపదం"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "ననà±à°¨à± à°—à±à°°à±à°¤à±à°‚à°šà±à°•ో"
@@ -1791,21 +2032,21 @@ msgstr ""
"మీ వాడà±à°•రిపేరౠమరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿. మీకౠఇంకా వాడà±à°•రిపేరౠలేదా? కొతà±à°¤ ఖాతాని [నమోదà±à°šà±‡à°¸à±à°•ోండి]"
"(%%action.register%%)."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± మాతà±à°°à°®à±‡ మరొక వాడà±à°•రిని నిరà±à°µà°¾à°¹à°•à±à°¨à°¿à°—à°¾ చేయగలరà±."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s ఇపà±à°ªà°Ÿà°¿à°•ే \"%2$s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•ే \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±."
@@ -1814,6 +2055,27 @@ msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•ే \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°
msgid "No current status"
msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ à°¸à±à°¥à°¿à°¤à°¿ à°à°®à±€ లేదà±"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "కొతà±à°¤ ఉపకరణం"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "ఉపకరణాలని నమోదà±à°šà±‡à°¸à±à°•ోడానికి మీరౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "కొతà±à°¤ ఉపకరణానà±à°¨à°¿ నమోదà±à°šà±‡à°¸à±à°•ోడానికి à°ˆ ఫారానà±à°¨à°¿ ఉపయోగించండి."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "మారà±à°ªà±‡à°°à±à°²à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "కొతà±à°¤ à°—à±à°‚à°ªà±"
@@ -1897,6 +2159,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"మీరౠ[à°’à°• ఖాతా నమోదౠచేసà±à°•à±à°¨à°¿](%%%%action.register%%%%) [à°ˆ విషయంపై à°µà±à°°à°¾à°¸à±‡](%%%%action."
+"newnotice%%%%?status_textarea=%s) మొదటివారౠఎందà±à°•à±à°•ాకూడదà±!"
#: actions/noticesearchrss.php:96
#, fuzzy, php-format
@@ -1921,6 +2185,49 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "మీ ఉపకరణాలనౠచూడడానికి మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "ఇతర ఎంపికలà±"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "మీరౠనమోదౠచేసివà±à°¨à±à°¨ ఉపకరణాలà±"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "సంధానిత ఉపకరణాలà±"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "మీరౠఆ ఉపకరణం యొకà±à°• వాడà±à°•à°°à°¿ కాదà±."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr ""
@@ -1938,8 +2245,8 @@ msgstr "విషయ రకం "
msgid "Only "
msgstr "మాతà±à°°à°®à±‡ "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -1952,7 +2259,7 @@ msgid "Notice Search"
msgstr "నోటీసà±à°² à°…à°¨à±à°µà±‡à°·à°£"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "ఇతర అమరికలà±"
#: actions/othersettings.php:71
@@ -2008,6 +2315,11 @@ msgstr "సందేశపౠవిషయం సరైనది కాదà±"
msgid "Login token expired."
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2078,7 +2390,7 @@ msgstr "కొతà±à°¤ సంకేతపదానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à
msgid "Password saved."
msgstr "సంకేతపదం à°­à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2086,137 +2398,153 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "హోమౠపేజీ URL సరైనది కాదà±."
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "సైటà±"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "సేవకి"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "కొతà±à°¤ సందేశం"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "అలంకారం"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "అలంకారాల సేవకి"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "అలంకార సంచయం"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "అవతారాలà±"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "అవతారాల సేవకి"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "అవతారానà±à°¨à°¿ తాజాకరించాం."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "అవతారాల సంచయం"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "నేపథà±à°¯à°¾à°²à±"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "నేపథà±à°¯à°¾à°² సేవకి"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
#, fuzzy
msgid "Background path"
msgstr "నేపథà±à°¯à°‚"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "నేపథà±à°¯à°¾à°² సంచయం"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "వైదొలగà±"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "కొనà±à°¨à°¿à°¸à°¾à°°à±à°²à±"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "à°Žà°²à±à°²à°ªà±à°ªà±à°¡à±‚"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "వైదొలగà±"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "కొతà±à°¤ సందేశం"
@@ -2279,7 +2607,7 @@ msgid "Full name"
msgstr "పూరà±à°¤à°¿ పేరà±"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "హోమౠపేజీ"
@@ -2302,7 +2630,7 @@ msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "à°ªà±à°°à°¾à°‚తం"
@@ -2326,7 +2654,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "భాష"
@@ -2352,7 +2680,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚ చాలా పెదà±à°¦à°—à°¾ ఉంది (%d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "కాలమండలానà±à°¨à°¿ à°Žà°‚à°šà±à°•ోలేదà±."
@@ -2365,24 +2693,24 @@ msgstr "భాష మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à
msgid "Invalid tag: \"%s\""
msgstr "'%s' అనే హోమౠపేజీ సరైనదికాదà±"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "అమరికలౠభదà±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
@@ -2404,39 +2732,39 @@ msgstr "à°ªà±à°°à°œà°¾ కాలరేఖ, పేజీ %d"
msgid "Public timeline"
msgstr "à°ªà±à°°à°œà°¾ కాలరేఖ"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "à°ªà±à°°à°œà°¾ వాహిని ఫీడà±"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "à°ªà±à°°à°œà°¾ వాహిని ఫీడà±"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "à°ªà±à°°à°œà°¾ వాహిని ఫీడà±"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2445,13 +2773,15 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"ఇది %%site.name%%, à°¸à±à°µà±‡à°šà±à°›à°¾ మృదూపకరమైన [à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±](http://status.net/) అనే పనిమà±à°Ÿà±à°Ÿà±à°ªà±ˆ "
+"ఆధారపడిన à°’à°• [మైకà±à°°à±‹-à°¬à±à°²à°¾à°—à°¿à°‚à°—à±](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
#: actions/publictagcloud.php:57
#, fuzzy
@@ -2477,9 +2807,9 @@ msgstr ""
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
-msgstr ""
+msgstr "[à°’à°• ఖాతాని నమోదà±à°šà±‡à°¸à±à°•à±à°¨à°¿](%%action.register%%) మీరే మొదట à°µà±à°°à°¾à°¸à±‡à°µà°¾à°°à± à°Žà°‚à°¦à±à°•ౠకాకూడదà±!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "à°Ÿà±à°¯à°¾à°—ౠమేఘం"
@@ -2552,7 +2882,7 @@ msgstr ""
#: actions/recoverpassword.php:213
msgid "Unknown action"
-msgstr ""
+msgstr "తెలియని à°šà°°à±à°¯"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
@@ -2616,7 +2946,7 @@ msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, తపà±à°ªà± ఆహà±à°µà°¾à°¨ à°¸à°
msgid "Registration successful"
msgstr "నమోదౠవిజయవంతం"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదà±"
@@ -2656,7 +2986,7 @@ msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తపà±à°ªà°¨à°¿à°¸à°°à°¿."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "ఈమెయిలà±"
@@ -2700,6 +3030,18 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
+"%1$s, అభినందనలà±! %%%%site.name%%%%à°•à°¿ à°¸à±à°µà°¾à°—తం. ఇకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, మీరà±...\n"
+"\n"
+"* [మీ à°ªà±à°°à±Šà°«à±ˆà°²à±](%2$s)à°•à°¿ వెళà±à°³à°¿ మీ మొదటి సందేశానà±à°¨à°¿ à°µà±à°°à°¾à°¯à°‚à°¡à°¿.\n"
+"* [జాబరà±/జీటాకౠచిరà±à°¨à°¾à°®à°¾à°¨à°¿](%%%%action.imsettings%%%%) చేరà±à°šà±à°•ోండి à°…à°ªà±à°ªà±à°¡à± తకà±à°·à°£ సందేశాల à°¦à±à°µà°¾à°°à°¾ "
+"మీరౠనోటీసà±à°²à°¨à°¿ పంపగలà±à°—à±à°¤à°¾à°°à±.\n"
+"* మీకౠతెలిసిన లేదా మీ ఆసకà±à°¤à±à°²à°¨à± పంచà±à°•à±à°¨à±‡ [à°µà±à°¯à°•à±à°¤à±à°² కోసం వెతకండి](%%%%action.peoplesearch%%"
+"%%).\n"
+"* మీ à°—à±à°°à°¿à°‚à°šà°¿ ఇతరà±à°²à°•ౠమరింత చెపà±à°ªà°¡à°¾à°¨à°¿à°•à°¿ మీ [à°ªà±à°°à±Šà°«à±ˆà°²à± అమరికలని](%%%%action.profilesettings%%%"
+"%) తాజాకరించà±à°•ోండి. \n"
+"* సౌలభà±à°¯à°¾à°²à°¨à± తెలà±à°¸à±à°•ోడానికి [ఆనà±&zwnj;లైనౠపతà±à°°à°¾à°µà°³à°¿](%%%%doc.help%%%%)ని చూడండి. \n"
+"\n"
+"నమోదà±à°šà±‡à°¸à±à°•à±à°¨à±à°¨à°‚à°¦à±à°•ౠకృతజà±à°žà°¤à°²à± మరియౠఈ సేవని ఉపయోగిసà±à°¤à±‚ మీరౠఆనందిసà±à°¤à°¾à°°à°¨à°¿ మేం ఆశిసà±à°¤à±à°¨à±à°¨à°¾à°‚."
#: actions/register.php:562
msgid ""
@@ -2741,7 +3083,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "చందాచేరà±"
@@ -2780,7 +3122,7 @@ msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోà
msgid "You already repeated that notice."
msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•ే à°† వాడà±à°•రిని నిరోధించారà±."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "సృషà±à°Ÿà°¿à°¤à°‚"
@@ -2796,6 +3138,11 @@ msgstr "సృషà±à°Ÿà°¿à°¤à°‚"
msgid "Replies to %s"
msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2824,6 +3171,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"మీరౠఇతర వాడà±à°•à°°à±à°²à°¤à±‹ సంభాషించవచà±à°šà±, మరింత మంది à°µà±à°¯à°•à±à°¤à±à°²à°•ౠచందాచేరవచà±à°šà± లేదా [à°—à±à°‚à°ªà±à°²à°²à±‹ చేరవచà±à°šà±]"
+"(%%action.groups%%)."
#: actions/replies.php:205
#, php-format
@@ -2837,6 +3186,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2847,6 +3200,123 @@ msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•ే లోనికి à°ªà±à°°à°µà±‡
msgid "User is already sandboxed."
msgstr "వాడà±à°•రిని ఇపà±à°ªà°Ÿà°¿à°•ే à°—à±à°‚à°ªà±à°¨à±à°‚à°¡à°¿ నిరోధించారà±."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటౠసైటà±à°•à°¿ రూపà±à°°à±‡à°–à°² అమరికలà±."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "à°—à±à°‚à°ªà±à°¨à°¿ వదిలివెళà±à°³à°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "à°ªà±à°°à°¤à±€à°•à°‚"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "పేరà±"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "సంసà±à°§"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "వివరణ"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "గణాంకాలà±"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "ఉపకరణ à°šà°°à±à°¯à°²à±"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "ఉపకరణ సమాచారం"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+#, fuzzy
+msgid "Authorize URL"
+msgstr "రచయిత"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "మీరౠనిజంగానే à°ˆ నోటీసà±à°¨à°¿ తొలగించాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à°¾?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%1$sà°•à°¿ ఇషà±à°Ÿà°®à±ˆà°¨ నోటీసà±à°²à±, పేజీ %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2896,17 +3366,22 @@ msgstr "మీకౠనచà±à°šà°¿à°¨à°µà°¿ పంచà±à°•ోడానికà
msgid "%s group"
msgstr "%s à°—à±à°‚à°ªà±"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s à°—à±à°‚పౠసభà±à°¯à±à°²à±, పేజీ %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "à°—à±à°‚పౠపà±à°°à±Šà°«à±ˆà°²à±"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "గమనిక"
@@ -2952,10 +3427,6 @@ msgstr "(à°à°®à±€à°²à±‡à°¦à±)"
msgid "All members"
msgstr "అందరౠసభà±à°¯à±à°²à±‚"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "గణాంకాలà±"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "సృషà±à°Ÿà°¿à°¤à°‚"
@@ -3010,6 +3481,11 @@ msgstr "నోటీసà±à°¨à°¿ తొలగించాం."
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s మరియౠమితà±à°°à±à°²à±, పేజీ %2$d"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3035,25 +3511,26 @@ msgstr "%s యొకà±à°• సందేశమà±à°² ఫీడà±"
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"ఈమధà±à°¯à±‡ à°à°¦à±ˆà°¨à°¾ ఆసకà±à°¤à°¿à°•రమైనది చూసారా? మీరౠఇంకా నోటీసà±à°²à±‡à°®à±€ à°µà±à°°à°¾à°¯à°²à±‡à°¦à±, మొదలà±à°ªà±†à°Ÿà±à°Ÿà°¡à°¾à°¨à°¿à°•à°¿ ఇదే మంచి సమయం :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3062,7 +3539,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3070,10 +3547,10 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
-#, fuzzy, php-format
+#: actions/showstream.php:305
+#, php-format
msgid "Repeat of %s"
-msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
+msgstr "%s యొకà±à°• à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°‚"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3086,206 +3563,147 @@ msgstr "వాడà±à°•రిని ఇపà±à°ªà°Ÿà°¿à°•ే à°—à±à°‚à°ªà±à°¨à
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటౠసైటà±à°•à°¿ à°ªà±à°°à°¾à°§à°®à°¿à°• అమరికలà±."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "సైటౠపేరౠతపà±à°ªà°¨à°¿à°¸à°°à°¿à°—à°¾ à°¸à±à°¨à±à°¨à°¾ కంటే à°Žà°•à±à°•à±à°µ పొడవà±à°‚డాలి."
-#: actions/siteadminpanel.php:154
-#, fuzzy
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
-msgstr "మీకౠసరైన సంపà±à°°à°¦à°¿à°‚పౠఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఉండాలి"
+msgstr "మీకౠసరైన సంపà±à°°à°¦à°¿à°‚పౠఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఉండాలి."
-#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#: actions/siteadminpanel.php:158
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "à°—à±à°°à±à°¤à± తెలియని భాష \"%s\""
+msgstr "à°—à±à°°à±à°¤à± తెలియని భాష \"%s\"."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "కనిషà±à°  పాఠà±à°¯ పరిమితి 140 à°…à°•à±à°·à°°à°¾à°²à±."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "సాధారణ"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "సైటౠపేరà±"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "మీ సైటౠయొకà±à°• పేరà±, ఇలా \"మీకంపెనీ మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "à°ˆ వాడà±à°•రికై నమోదైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°²à± à°à°®à±€ లేవà±."
-#: actions/siteadminpanel.php:277
-#, fuzzy
+#: actions/siteadminpanel.php:263
msgid "Local"
-msgstr "à°ªà±à°°à°¾à°‚తం"
+msgstr "à°¸à±à°¥à°¾à°¨à°¿à°•"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
-msgstr ""
+msgstr "à°…à°ªà±à°°à°®à±‡à°¯ కాలమండలం"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
-#, fuzzy
+#: actions/siteadminpanel.php:281
msgid "Default site language"
-msgstr "à°ªà±à°°à°¾à°¥à°¾à°¨à±à°¯à°¤à°¾ భాష"
-
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "వైదొలగà±"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "అంగీకరించà±"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "అంతరంగికం"
+msgstr "à°…à°ªà±à°°à°®à±‡à°¯ సైటౠభాష"
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "à°…à°œà±à°žà°¾à°¤ (à°ªà±à°°à°µà±‡à°¶à°¿à°‚చని) వాడà±à°•à°°à±à°²à°¨à°¿ సైటà±à°¨à°¿ చూడకà±à°‚à°¡à°¾ నిషేధించాలా?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à°•ౠమాతà±à°°à°®à±‡"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మాతà±à°°à°®à±‡ నమోదౠఅవà±à°µà°—లిగేలా చెయà±à°¯à°¿."
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "కొతà±à°¤ నమోదà±à°²à°¨à± అచేతనంచేయి."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "తరచà±à°¦à°¨à°‚"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "పరిమితà±à°²à±"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "పాఠà±à°¯à°ªà± పరిమితి"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "సందేశాలలోని à°…à°•à±à°·à°°à°¾à°² à°—à°°à°¿à°·à±à°  సంఖà±à°¯."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±"
-
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "SMS అమరికలà±"
@@ -3343,7 +3761,7 @@ msgstr "ఇది ఇపà±à°ªà°Ÿà°¿à°•ే మీ ఫోనౠనెంబరà±
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "à°† ఫోనౠనంబరౠఇపà±à°ªà°Ÿà°¿à°•ే వేరే వాడà±à°•à°°à°¿à°•à°¿ చెందినది."
#: actions/smssettings.php:347
#, fuzzy
@@ -3383,16 +3801,26 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "చందాని సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• వాడà±à°•à°°à°¿ కాదà±."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ ఫైలౠలేదà±."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "చందాదారà±à°²à±"
@@ -3403,29 +3831,30 @@ msgid "%s subscribers"
msgstr "%s చందాదారà±à°²à±"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s చందాదారà±à°²à±, పేజీ %d"
+msgstr "%1$s చందాదారà±à°²à±, పేజీ %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "వీళà±à°³à± మీ నోటీసà±à°²à°¨à°¿ వినే à°ªà±à°°à°œà°²à±."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "వీళà±à°³à± %s యొకà±à°• నోటీసà±à°²à°¨à°¿ వినే à°ªà±à°°à°œà°²à±."
#: actions/subscribers.php:108
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"మీకౠచందాదారà±à°²à± ఎవరూ లేరà±. మీకౠతెలిసినవారికి చందాచేర à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿ వాళà±à°³à± à°ªà±à°°à°¤à±à°¯à±à°ªà°•ారం చేయవచà±à°šà±."
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%sà°•à°¿ చందాదారà±à°²à± ఎవరూ లేరà±. మీరే మొదటివారౠకావాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à°¾?"
#: actions/subscribers.php:114
#, php-format
@@ -3440,9 +3869,9 @@ msgid "%s subscriptions"
msgstr "%s చందాలà±"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%s చందాలà±, పేజీ %d"
+msgstr "%1$s చందాలà±, పేజీ %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -3453,7 +3882,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3463,19 +3892,24 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "జాబరà±"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3505,7 +3939,8 @@ msgstr ""
msgid "User profile"
msgstr "వాడà±à°•à°°à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à±"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "ఫొటో"
@@ -3563,7 +3998,7 @@ msgstr ""
msgid "Unsubscribed"
msgstr "చందాదారà±à°²à±"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3578,90 +4013,68 @@ msgstr "వాడà±à°•à°°à°¿"
msgid "User settings for this StatusNet site."
msgstr "à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటౠసైటà±à°•à°¿ వాడà±à°•à°°à°¿ అమరికలà±."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯ పరిమితి"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚ యొకà±à°• à°—à°°à°¿à°·à±à°  పొడవà±, à°…à°•à±à°·à°°à°¾à°²à°²à±‹."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "కొతà±à°¤ వాడà±à°•à°°à±à°²à±"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "కొతà±à°¤ వాడà±à°•à°°à°¿ à°¸à±à°µà°¾à°—తం"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "కొతà±à°¤ వాడà±à°•à°°à±à°²à°•ై à°¸à±à°µà°¾à°—à°¤ సందేశం (255 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
-#: actions/useradminpanel.php:241
-#, fuzzy
+#: actions/useradminpanel.php:240
msgid "Default subscription"
-msgstr "à°…à°¨à±à°¨à°¿ చందాలà±"
+msgstr "à°…à°ªà±à°°à°®à±‡à°¯ చందా"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "ఉపయోగించాలà±à°¸à°¿à°¨ యాంతà±à°°à°¿à°• à°•à±à°¦à°¿à°‚పౠసేవ."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "ఆహà±à°µà°¾à°¨à°¾à°²à±"
-#: actions/useradminpanel.php:256
-#, fuzzy
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
-msgstr "ఆహà±à°µà°¾à°¨à°®à±(à°²)ని పంపించాం"
+msgstr "ఆహà±à°µà°¾à°¨à°¾à°²à°¨à°¿ చేతనంచేసాం"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr "వాడà±à°•à°°à±à°²à°¨à± కొతà±à°¤ వారిని ఆహà±à°µà°¾à°¨à°¿à°‚చడానికి à°…à°¨à±à°®à°¤à°¿à°‚చాలా వదà±à°¦à°¾."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "చందాని అధీకరించండి"
#: actions/userauthorization.php:110
msgid ""
@@ -3670,84 +4083,84 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "లైసెనà±à°¸à±"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "అంగీకరించà±"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "à°ˆ వాడà±à°•à°°à°¿à°•à°¿ చందాచేరà±"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "తిరసà±à°•à°°à°¿à°‚à°šà±"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "à°ˆ చందాని తిరసà±à°•à°°à°¿à°‚à°šà±"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "చందాని తిరసà±à°•రించారà±."
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "'%s' అనే అవతారపౠURL తపà±à°ªà±"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "'%s' కొరకౠతపà±à°ªà±à°¡à± బొమà±à°® à°°à°•à°‚"
@@ -3766,6 +4179,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s à°—à±à°‚పౠసభà±à°¯à±à°²à±, పేజీ %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "మరినà±à°¨à°¿ à°—à±à°‚à°ªà±à°²à°•ై వెతà±à°•à±"
@@ -3781,9 +4199,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr "[à°—à±à°‚à°ªà±à°²à°¨à°¿ వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿."
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "గణాంకాలà±"
+msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± %s"
#: actions/version.php:153
#, php-format
@@ -3792,11 +4210,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3828,23 +4241,14 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-msgid "Name"
-msgstr "పేరà±"
-
-#: actions/version.php:196 lib/action.php:741
-#, fuzzy
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
-msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤"
+msgstr "సంచిక"
#: actions/version.php:197
msgid "Author(s)"
msgstr "రచయిత(à°²à±)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "వివరణ"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3863,19 +4267,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "à°—à±à°‚పౠపà±à°°à±Šà°«à±ˆà°²à±"
+msgstr "à°—à±à°‚à°ªà±à°²à±‹ చేరడం విఫలమైంది."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
+msgstr "à°—à±à°‚à°ªà±à°²à±‹ భాగం కాదà±."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "à°—à±à°‚పౠపà±à°°à±Šà°«à±ˆà°²à±"
+msgstr "à°—à±à°‚పౠనà±à°‚à°¡à°¿ వైదొలగడం విఫలమైంది."
#: classes/Login_token.php:76
#, fuzzy, php-format
@@ -3894,63 +4295,88 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "à°ˆ సైటà±à°²à±‹ నోటీసà±à°²à± రాయడం à°¨à±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిషేధించారà±."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "చందాచేరడం à°¨à±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిషేధించారà±."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "ఇపà±à°ªà°Ÿà°¿à°•ే చందాచేరారà±!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "వాడà±à°•à°°à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "చందాదారà±à°²à±"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sà°•à°¿ à°¸à±à°µà°¾à°—తం!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
-#: classes/User_group.php:409
-#, fuzzy
+#: classes/User_group.php:452
msgid "Could not set group membership."
-msgstr "చందాని సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
+msgstr "à°—à±à°‚పౠసభà±à°¯à°¤à±à°µà°¾à°¨à±à°¨à°¿ అమరà±à°šà°²à±‡à°•పోయాం."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3990,132 +4416,126 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "à°®à±à°‚గిలి"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-msgid "Account"
-msgstr "ఖాతా"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•ోండి"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "à°…à°¨à±à°¸à°‚ధానించà±"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "చందాలà±"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ఆహà±à°µà°¾à°¨à°¿à°‚à°šà±"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "సైటౠనà±à°‚à°¡à°¿ నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "సైటà±à°²à±‹à°¨à°¿ à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "సహాయం"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "వెతà±à°•à±"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
-#, fuzzy
+#: lib/action.php:493
msgid "Site notice"
-msgstr "కొతà±à°¤ సందేశం"
+msgstr "సైటౠగమనిక"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• వీకà±à°·à°£à°²à±"
-#: lib/action.php:619
-#, fuzzy
+#: lib/action.php:625
msgid "Page notice"
-msgstr "కొతà±à°¤ సందేశం"
+msgstr "పేజీ గమనిక"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "చందాలà±"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "à°—à±à°°à°¿à°‚à°šà°¿"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "à°ªà±à°°à°¶à±à°¨à°²à±"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "సేవా నియమాలà±"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "అంతరంగికత"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "మూలమà±"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "సంపà±à°°à°¦à°¿à°‚à°šà±"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "బాడà±à°œà°¿"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసెనà±à°¸à±"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4124,12 +4544,12 @@ msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారౠ"
"అందిసà±à°¤à±à°¨à±à°¨ మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚. "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** అనేది మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4140,33 +4560,55 @@ msgstr ""
"html) à°•à°¿à°‚à°¦ లభà±à°¯à°®à°¯à±à°¯à±‡ [à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటà±](http://status.net/) మైకà±à°°à±‹à°¬à±à°²à°¾à°—ింగౠఉపకరణం సంచిక %s "
"పై నడà±à°¸à±à°¤à±à°‚ది."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "కొతà±à°¤ సందేశం"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "à°…à°¨à±à°¨à±€ "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "తరà±à°µà°¾à°¤"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "ఇంతకà±à°°à°¿à°¤à°‚"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4194,15 +4636,105 @@ msgid "Basic site configuration"
msgstr "à°ªà±à°°à°¾à°¥à°®à°¿à°• సైటౠసà±à°µà°°à±‚పణం"
#: lib/adminpanelaction.php:317
-#, fuzzy
msgid "Design configuration"
+msgstr "రూపకలà±à°ªà°¨ à°¸à±à°µà°°à±‚పణం"
+
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "వాడà±à°•à°°à°¿ à°¸à±à°µà°°à±‚పణం"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "రూపకలà±à°ªà°¨ à°¸à±à°µà°°à±‚పణం"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "ఉపకరణానà±à°¨à°¿ మారà±à°šà±"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "à°ˆ ఉపకరణానికి à°ªà±à°°à°¤à±€à°•à°‚"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "మీ ఉపకరణం à°—à±à°°à°¿à°‚à°šà°¿ %d à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ వివరించండి"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "మీ ఉపకరణానà±à°¨à°¿ వివరించండి"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "మూలమà±"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "à°ˆ ఉపకరణం యొకà±à°• హోమà±&zwnj;పేజీ à°šà°¿à°°à±à°¨à°¾à°®à°¾"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "à°ˆ ఉపకరణానికి బాధà±à°¯à°¤à°¾à°¯à±à°¤à°®à±ˆà°¨ సంసà±à°¥"
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "విహారిణి"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "తొలగించà±"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "జోడింపà±à°²à±"
@@ -4224,12 +4756,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "సంకేతపదం మారà±à°ªà±"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "సంకేతపదం మారà±à°ªà±"
@@ -4349,14 +4881,12 @@ msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•ోలేరà±."
+msgstr "మీ నోటిసà±à°¨à°¿ మీరే à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చలేరà±"
#: lib/command.php:418
-#, fuzzy
msgid "Already repeated that notice"
-msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±"
+msgstr "ఇపà±à°ªà°Ÿà°¿à°•ే à°ˆ నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చారà±"
#: lib/command.php:426
#, fuzzy, php-format
@@ -4385,82 +4915,91 @@ msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొà
#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "à°à°µà°°à°¿à°•à°¿ చందా చేరాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à±‹ à°† వాడà±à°•à°°à°¿ పేరౠతెలియజేయండి"
+
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±"
-#: lib/command.php:554
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%sà°•à°¿ చందా చేరారà±"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "ఎవరి à°¨à±à°‚à°¡à°¿ చందా విరమించాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à±‹ à°† వాడà±à°•à°°à°¿ పేరౠతెలియజేయండి"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "%s à°¨à±à°‚à°¡à°¿ చందా విరమించారà±"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "à°ˆ లంకెని ఒకే సారి ఉపయోగించగలరà±, మరియౠఅది పనిచేసేది 2 నిమిషాలౠమాతà±à°°à°®à±‡: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s à°¨à±à°‚à°¡à°¿ చందా విరమించారà±"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "మీరౠఎవరికీ చందాచేరలేదà±."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
msgstr[1] "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "మీకౠచందాదారà±à°²à± ఎవరూ లేరà±."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
msgstr[1] "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "మీరౠఠగà±à°‚à°ªà±à°²à±‹à°¨à±‚ సభà±à°¯à±à°²à± కాదà±."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరౠఇపà±à°ªà°Ÿà°¿à°•ే లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!"
msgstr[1] "మీరౠఇపà±à°ªà°Ÿà°¿à°•ే లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4474,6 +5013,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4501,20 +5041,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం లేదà±."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4530,6 +5070,14 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "à°…à°¨à±à°¸à°‚ధానాలà±"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4539,10 +5087,9 @@ msgid "Upload file"
msgstr "ఫైలà±à°¨à°¿ à°Žà°•à±à°•à°¿à°‚à°šà±"
#: lib/designsettings.php:109
-#, fuzzy
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "మీ à°¸à±à°µà°‚à°¤ నేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మీరౠఎకà±à°•ించవచà±à°šà±. à°—à°°à°¿à°·à±à°  ఫైలౠపరిమాణం 2మెబై."
+msgstr "మీ à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ నేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మీరౠఎకà±à°•ించవచà±à°šà±. à°—à°°à°¿à°·à±à°  ఫైలౠపరిమాణం 2మెబై."
#: lib/designsettings.php:418
msgid "Design defaults restored."
@@ -4616,15 +5163,14 @@ msgid "Describe the group or topic"
msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿"
+msgstr "à°—à±à°‚పౠలేదా విషయానà±à°¨à°¿ à°—à±à°°à°¿à°‚à°šà°¿ %d à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ వివరించండి"
#: lib/groupeditform.php:179
-#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "మీరౠఎకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, \"నగరం, రాషà±à°Ÿà±à°°à°‚ (లేదా à°ªà±à°°à°¾à°‚తం), దేశం\""
+msgstr "à°—à±à°‚పౠయొకà±à°• à°ªà±à°°à°¾à°‚తం, ఉంటే, \"నగరం, రాషà±à°Ÿà±à°°à°‚ (లేదా à°ªà±à°°à°¾à°‚తం), దేశం\""
#: lib/groupeditform.php:187
#, php-format
@@ -4719,12 +5265,12 @@ msgstr "మెబై"
msgid "kB"
msgstr "కిబై"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, fuzzy, php-format
msgid "Unknown inbox source %d."
msgstr "à°—à±à°°à±à°¤à± తెలియని భాష \"%s\""
@@ -4770,7 +5316,7 @@ msgstr ""
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s ఇపà±à°ªà±à°¡à± %2$sలో మీ నోటీసà±à°²à°¨à°¿ వింటà±à°¨à±à°¨à°¾à°°à±."
#: lib/mail.php:241
#, php-format
@@ -4786,13 +5332,21 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s ఇపà±à°ªà±à°¡à± %2$sలో మీ నోటీసà±à°²à°¨à°¿ వింటà±à°¨à±à°¨à°¾à°°à±.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"మీ విధేయà±à°²à±,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"మీ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°¨à°¿ లేదా గమనింపà±à°² ఎంపికలనౠ%8$s వదà±à°¦ మారà±à°šà±à°•ోండి\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚: %s\n"
-"\n"
+msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚: %s"
#: lib/mail.php:286
#, php-format
@@ -4895,7 +5449,7 @@ msgstr ""
#: lib/mail.php:624
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) మీకౠఒక నోటీసà±à°¨à°¿ పంపించారà±"
#: lib/mail.php:626
#, php-format
@@ -4911,6 +5465,16 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) %2$sలో మీకౠ('@-à°¸à±à°ªà°‚దన') à°’à°• నోటీసà±à°¨à°¿ పంపించారౠ.\n"
+"\n"
+"à°† నోటీసౠఇకà±à°•à°¡:\n"
+"\n"
+"%3$s\n"
+"\n"
+"ఇదీ పాఠà±à°¯à°‚:\n"
+"\n"
+"%4$s\n"
+"\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -4922,7 +5486,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "à°¨à±à°‚à°¡à°¿"
@@ -5041,58 +5605,54 @@ msgid "Do not share my location"
msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "à°‰"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "à°¦"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "తూ"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "à°ª"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "సందరà±à°­à°‚లో"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "సృషà±à°Ÿà°¿à°¤à°‚"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "à°ˆ నోటీసà±à°ªà±ˆ à°¸à±à°ªà°‚దించండి"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "à°¸à±à°ªà°‚దించండి"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "నోటీసà±à°¨à°¿ తొలగించాం."
@@ -5127,11 +5687,7 @@ msgstr "దూరపౠపà±à°°à±Šà°ªà±ˆà°²à±à°¨à°¿ చేరà±à°šà°Ÿà°‚à°²à
msgid "Duplicate notice"
msgstr "కొతà±à°¤ సందేశం"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "చందాచేరడం à°¨à±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిషేధించారà±."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5147,19 +5703,19 @@ msgstr "à°¸à±à°ªà°‚దనలà±"
msgid "Favorites"
msgstr "ఇషà±à°Ÿà°¾à°‚శాలà±"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "వచà±à°šà°¿à°¨à°µà°¿"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "మీకౠవచà±à°šà°¿à°¨ సందేశాలà±"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "పంపినవి"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "మీరౠపంపిన సందేశాలà±"
@@ -5239,6 +5795,10 @@ msgstr "à°ˆ నోటీసà±à°ªà±ˆ à°¸à±à°ªà°‚దించండి"
msgid "Repeat this notice"
msgstr "à°ˆ నోటీసà±à°ªà±ˆ à°¸à±à°ªà°‚దించండి"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5297,48 +5857,18 @@ msgstr "à°ˆ వాడà±à°•రిని నిరోధించà±"
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr ""
+msgstr "%s చందాచేరిన à°µà±à°¯à°•à±à°¤à±à°²à±"
#: lib/subgroupnav.php:91
-#, fuzzy, php-format
+#, php-format
msgid "People subscribed to %s"
-msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
+msgstr "%sà°•à°¿ చందాచేరిన à°µà±à°¯à°•à±à°¤à±à°²à±"
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
msgstr "%s సభà±à°¯à±à°²à±à°—à°¾ ఉనà±à°¨ à°—à±à°‚à°ªà±à°²à±"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "ఇపà±à°ªà°Ÿà°¿à°•ే చందాచేరారà±!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "వాడà±à°•à°°à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "చందా చేరà±à°šà°²à±‡à°•పోయాం."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "చందాదారà±à°²à±"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5391,68 +5921,68 @@ msgstr "అవతారానà±à°¨à°¿ మారà±à°šà±"
msgid "User actions"
msgstr "వాడà±à°•à°°à°¿ à°šà°°à±à°¯à°²à±"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "à°«à±à°°à±Šà°«à±ˆà°²à± అమరికలà±"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "మారà±à°šà±"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
-msgstr ""
+msgstr "à°ˆ వాడà±à°•à°°à°¿à°•à°¿ à°’à°• నేరౠసందేశానà±à°¨à°¿ పంపించండి"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "సందేశం"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚"
@@ -5466,7 +5996,7 @@ msgstr "%s అనేది సరైన రంగౠకాదà±!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s అనేది సరైన రంగౠకాదà±! 3 లేదా 6 హెకà±à°¸à± à°…à°•à±à°·à°°à°¾à°²à°¨à± వాడండి."
-#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#: lib/xmppmanager.php:402
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±"
+msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %1$d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%2$d పంపించారà±."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index c45612030..149b21292 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Turkish
#
+# Author@translatewiki.net: Joseph
# Author@translatewiki.net: McDutchie
# --
# This file is distributed under the same license as the StatusNet package.
@@ -8,17 +9,75 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:15+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51: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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Kabul et"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Ayarlar"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Kayıt"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Gizlilik"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr ""
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Kaydet"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Ayarlar"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -34,25 +93,29 @@ msgstr "Böyle bir durum mesajı yok."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s ve arkadaşları"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -93,7 +156,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -105,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s ve arkadaşları"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -116,23 +179,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Onay kodu bulunamadı."
@@ -147,7 +210,7 @@ msgstr "Onay kodu bulunamadı."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -178,8 +241,9 @@ msgstr "Profil kaydedilemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -299,12 +363,12 @@ msgstr "Kullanıcı güncellenemedi."
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Kullanıcı güncellenemedi."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Kullanıcı güncellenemedi."
@@ -329,7 +393,8 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
msgid "Not a valid nickname."
msgstr "Geçersiz bir takma ad."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -341,7 +406,8 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
msgid "Full name is too long (max 255 chars)."
msgstr "Tam isim çok uzun (azm: 255 karakter)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
@@ -377,7 +443,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "İstek bulunamadı!"
@@ -421,6 +487,115 @@ msgstr ""
msgid "groups on %s"
msgstr ""
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Geçersiz büyüklük."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Kullanıcı ayarlamada hata oluştu."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Cevap eklenirken veritabanı hatası: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "BeklenmeÄŸen form girdisi."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+#, fuzzy
+msgid "Account"
+msgstr "Hakkında"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Takma ad"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Parola"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -453,18 +628,18 @@ msgstr "Avatar güncellendi."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -479,7 +654,7 @@ msgstr "Desteklenmeyen görüntü dosyası biçemi."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s adli kullanicinin durum mesajlari"
@@ -490,7 +665,7 @@ msgstr "%s adli kullanicinin durum mesajlari"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -506,27 +681,22 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "%s için cevaplar"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%s için cevaplar"
@@ -536,7 +706,7 @@ msgstr "%s için cevaplar"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s adli kullanicinin durum mesajlari"
@@ -599,8 +769,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr ""
@@ -612,29 +782,6 @@ msgstr "Yükle"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "BeklenmeÄŸen form girdisi."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -673,8 +820,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr ""
@@ -683,13 +831,13 @@ msgstr ""
msgid "Do not block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
@@ -776,7 +924,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Eposta onayı silinemedi."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Adresi Onayla"
#: actions/confirmaddress.php:159
@@ -794,10 +943,54 @@ msgstr "Yer"
msgid "Notices"
msgstr "Durum mesajları"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -827,7 +1020,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -968,16 +1161,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Kaydet"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -990,10 +1173,84 @@ msgstr ""
msgid "Add to favorites"
msgstr ""
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Böyle bir belge yok."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Tam isim çok uzun (azm: 255 karakter)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Takma ad kullanımda. Başka bir tane deneyin."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Abonelikler"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Kullanıcı güncellenemedi."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1022,7 +1279,7 @@ msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
msgid "Could not update group."
msgstr "Kullanıcı güncellenemedi."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Avatar bilgisi kaydedilemedi"
@@ -1064,7 +1321,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "İptal et"
@@ -1145,7 +1403,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
@@ -1157,7 +1415,7 @@ msgstr ""
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Onay kodu eklenemedi."
@@ -1216,7 +1474,7 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1369,7 +1627,7 @@ msgstr "Kullanıcının profili yok."
msgid "User is not a member of group."
msgstr "Bize o profili yollamadınız"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Böyle bir kullanıcı yok."
@@ -1469,23 +1727,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1664,6 +1922,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Bu sizin Jabber ID'niz deÄŸil."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1740,7 +2003,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Gönder"
@@ -1816,7 +2079,7 @@ msgstr "Yanlış kullanıcı adı veya parola."
msgid "Error setting user. You are probably not authorized."
msgstr "YetkilendirilmemiÅŸ."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "GiriÅŸ"
@@ -1825,17 +2088,6 @@ msgstr "GiriÅŸ"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Takma ad"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Parola"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Beni hatırla"
@@ -1867,21 +2119,21 @@ msgstr ""
"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
"[OpenID](%%action.openidlogin%%) ile giriş yapın."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "Kullanıcının profili yok."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "OpenID formu yaratılamadı: %s"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Kullanıcının profili yok."
@@ -1890,6 +2142,28 @@ msgstr "Kullanıcının profili yok."
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Avatar bilgisi kaydedilemedi"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -1997,6 +2271,49 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
@@ -2015,8 +2332,8 @@ msgstr "BaÄŸlan"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2030,7 +2347,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Ayarlar"
#: actions/othersettings.php:71
@@ -2087,6 +2404,11 @@ msgstr "Geçersiz durum mesajı"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2159,7 +2481,7 @@ msgstr "Yeni parola kaydedilemedi."
msgid "Password saved."
msgstr "Parola kaydedildi."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2167,140 +2489,156 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Sunucu"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Yeni durum mesajı"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Ayarlar"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Avatar güncellendi."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Avatar güncellendi."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Geri al"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Durum mesajları"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Geri al"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Yeni durum mesajı"
@@ -2367,7 +2705,7 @@ msgid "Full name"
msgstr "Tam İsim"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Başlangıç Sayfası"
@@ -2392,7 +2730,7 @@ msgstr "Hakkında"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Yer"
@@ -2416,7 +2754,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr ""
@@ -2442,7 +2780,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2455,25 +2793,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "%s Geçersiz başlangıç sayfası"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Ayarlar kaydedildi."
@@ -2495,39 +2833,39 @@ msgstr "Genel zaman çizgisi"
msgid "Public timeline"
msgstr "Genel zaman çizgisi"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Genel Durum Akış RSS Beslemesi"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Genel Durum Akış RSS Beslemesi"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Genel Durum Akış RSS Beslemesi"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2536,7 +2874,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2570,7 +2908,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2709,7 +3047,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -2749,7 +3087,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Eposta"
@@ -2838,7 +3176,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abone ol"
@@ -2878,7 +3216,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
msgid "You already repeated that notice."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Yarat"
@@ -2894,6 +3232,11 @@ msgstr "Yarat"
msgid "Replies to %s"
msgstr "%s için cevaplar"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%s için cevaplar"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2935,6 +3278,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%s için cevaplar"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Avatar güncellendi."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2945,6 +3293,124 @@ msgstr "Bize o profili yollamadınız"
msgid "User is already sandboxed."
msgstr "Kullanıcının profili yok."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Ayarlar"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Takma ad"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Yer"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Abonelikler"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "İstatistikler"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s ve arkadaşları"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2994,18 +3460,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Bütün abonelikler"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "Böyle bir durum mesajı yok."
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "Durum mesajları"
@@ -3053,10 +3524,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "İstatistikler"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3113,6 +3580,11 @@ msgstr "Durum mesajları"
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s ve arkadaşları"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3138,25 +3610,25 @@ msgstr "%s için durum RSS beslemesi"
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3165,7 +3637,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3173,7 +3645,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "%s için cevaplar"
@@ -3191,204 +3663,147 @@ msgstr "Kullanıcının profili yok."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Geçersiz bir eposta adresi."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Yeni durum mesajı"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Yer"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Geri al"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Kabul et"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Gizlilik"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Böyle bir kullanıcı yok."
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Ayarlar"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3489,17 +3904,27 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr "Bize o profili yollamadınız"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Abonelik oluşturulamadı."
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Böyle bir kullanıcı yok."
+msgid "No such profile."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Bize o profili yollamadınız"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Abone ol"
@@ -3560,7 +3985,7 @@ msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
msgid "These are the people whose notices %s listens to."
msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3570,20 +3995,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "JabberID yok."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "%s adli kullanicinin durum mesajlari"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3614,7 +4044,8 @@ msgstr ""
msgid "User profile"
msgstr "Kullanıcının profili yok."
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3676,7 +4107,7 @@ msgstr "Yetkilendirme isteÄŸi yok!"
msgid "Unsubscribed"
msgstr "Aboneliği sonlandır"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3691,87 +4122,67 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Bütün abonelikler"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "Takip talebine izin verildi"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Yer"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Takip isteÄŸini onayla"
@@ -3787,86 +4198,86 @@ msgstr ""
"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
"bulunmadıysanız \"İptal\" tuşuna basın. "
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Kabul et"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "Takip talebine izin verildi"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Reddet"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Bütün abonelikler"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Yetkilendirme isteÄŸi yok!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Takip talebine izin verildi"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Abonelik reddedildi."
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Avatar URLi '%s' okunamıyor"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "%s için yanlış resim türü"
@@ -3886,6 +4297,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Bütün abonelikler"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3912,11 +4328,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Avatar güncellendi."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3948,12 +4359,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Takma ad"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "KiÅŸisel"
@@ -3962,11 +4368,6 @@ msgstr "KiÅŸisel"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Abonelikler"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4016,61 +4417,88 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Cevap eklenirken veritabanı hatası: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Kullanıcının profili yok."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Abonelik silinemedi."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Abonelik silinemedi."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Avatar bilgisi kaydedilemedi"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Abonelik oluşturulamadı."
@@ -4114,136 +4542,131 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Başlangıç"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "Hakkında"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "BaÄŸlan"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Abonelikler"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Çıkış"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Yeni hesap oluÅŸtur"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Yardım"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Ara"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Hakkında"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "SSS"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Gizlilik"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Kaynak"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4252,12 +4675,12 @@ msgstr ""
"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
"hazırlanan anında mesajlaşma ağıdır. "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4268,35 +4691,57 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Önce »"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4329,11 +4774,107 @@ msgstr "Eposta adresi onayı"
msgid "Design configuration"
msgstr "Eposta adresi onayı"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Eposta adresi onayı"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Eposta adresi onayı"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "Eposta adresi onayı"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Eposta adresi onayı"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Kaynak"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr ""
+"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr ""
+"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Kaldır"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4355,12 +4896,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Parola kaydedildi."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Parola kaydedildi."
@@ -4515,80 +5056,90 @@ msgstr "Durum mesajını kaydederken hata oluştu."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Aboneliği sonlandır"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4602,6 +5153,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4629,20 +5181,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Onay kodu yok."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4658,6 +5210,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "BaÄŸlan"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4852,12 +5413,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5062,7 +5623,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5182,60 +5743,56 @@ msgid "Do not share my location"
msgstr "Profil kaydedilemedi."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "İçerik yok!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Yarat"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "cevapla"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Durum mesajları"
@@ -5269,11 +5826,7 @@ msgstr "Uzak profil eklemede hata oluÅŸtu"
msgid "Duplicate notice"
msgstr "Yeni durum mesajı"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Yeni abonelik eklenemedi."
@@ -5289,19 +5842,19 @@ msgstr "Cevaplar"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5383,6 +5936,10 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Repeat this notice"
msgstr "Böyle bir durum mesajı yok."
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5455,37 +6012,6 @@ msgstr "Uzaktan abonelik"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Kullanıcının profili yok."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Abonelik silinemedi."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Abonelik silinemedi."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5539,68 +6065,68 @@ msgstr "Avatar"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Profil ayarları"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
@@ -5614,7 +6140,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 49e8ae309..c261c310d 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -10,18 +10,72 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:18+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51: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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+msgid "Access"
+msgstr "ПогодитиÑÑŒ"
+
+#: actions/accessadminpanel.php:65
+msgid "Site access settings"
+msgstr "Параметри доÑтупу на Ñайт"
+
+#: actions/accessadminpanel.php:158
+msgid "Registration"
+msgstr "РеєÑтраціÑ"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr "Приватно"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Заборонити анонімним відвідувачам (ті, що не увійшли до ÑиÑтеми) переглÑдати "
+"Ñайт?"
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr "Лише за запрошеннÑми"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr "Зробити регіÑтрацію лише за запрошеннÑми."
+
+#: actions/accessadminpanel.php:173
+msgid "Closed"
+msgstr "Закрито"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr "СкаÑувати подальшу регіÑтрацію."
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Зберегти"
+
+#: actions/accessadminpanel.php:189
+msgid "Save access settings"
+msgstr "Зберегти параметри доÑтупу"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -36,25 +90,29 @@ msgstr "Ðемає такої Ñторінки"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Такого кориÑтувача немає."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s та друзі, Ñторінка %2$d"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -99,7 +157,7 @@ msgstr ""
"Ви можете [«розштовхати» %1$s](../%2$s) зі Ñторінки його профілю або [щоÑÑŒ "
"йому напиÑати](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -112,8 +170,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ви з друзÑми"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
@@ -123,23 +181,23 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API метод не знайдено."
@@ -153,7 +211,7 @@ msgstr "API метод не знайдено."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Цей метод потребує POST."
@@ -183,8 +241,9 @@ msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -301,11 +360,11 @@ msgstr "Ви не можете відпиÑатиÑÑŒ від Ñамого Ñеб
msgid "Two user ids or screen_names must be supplied."
msgstr "Два ID або імені_у_мережі повинні підтримуватиÑÑŒ."
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "Ðе вдалоÑÑŒ вÑтановити джерело кориÑтувача."
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ цільового кориÑтувача."
@@ -329,7 +388,8 @@ msgstr "Це Ñ–Ð¼â€™Ñ Ð²Ð¶Ðµ викориÑтовуєтьÑÑ. Спробуйт
msgid "Not a valid nickname."
msgstr "Це недійÑне Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -341,7 +401,8 @@ msgstr "Веб-Ñторінка має недійÑну URL-адреÑу."
msgid "Full name is too long (max 255 chars)."
msgstr "Повне Ñ–Ð¼â€™Ñ Ð·Ð°Ð´Ð¾Ð²Ð³Ðµ (255 знаків макÑимум)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ÐžÐ¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий (%d знаків макÑимум)."
@@ -377,7 +438,7 @@ msgstr "Додаткове Ñ–Ð¼â€™Ñ Ð½Ðµ може бути таким ÑамиÐ
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Групу не знайдено!"
@@ -418,6 +479,117 @@ msgstr "%s групи"
msgid "groups on %s"
msgstr "групи на %s"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Жодного параметру oauth_token не забезпечено."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Ðевірний токен."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—. Спробуйте знов, будь лаÑка."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "ÐедійÑне Ñ–Ð¼â€™Ñ / пароль!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Помилка бази даних при видаленні кориÑтувача OAuth-додатку."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Помилка бази даних при додаванні кориÑтувача OAuth-додатку."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"Токен запиту %s було авторизовано. Будь лаÑка, обмінÑйте його на токен "
+"доÑтупу."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "Токен запиту %s було ÑкаÑовано Ñ– відхилено."
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "ÐеÑподіване предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð¸."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Запит на дозвіл під’єднатиÑÑ Ð´Ð¾ Вашого облікового запиÑу"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Дозволити або заборонити доÑтуп"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Додаток <strong>%1$s</strong> від <strong>%2$s</strong> запитує дозвіл на "
+"<strong>%3$s</strong> дані Вашого акаунту %4$s. Ви повинні надавати дозвіл "
+"на доÑтуп до Вашого акаунту %4$s лише тим Ñтороннім додаткам, Ñким Ви "
+"довірÑєте."
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "Ðкаунт"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Пароль"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Відхилити"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Дозволити"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Дозволити або заборонити доÑтуп до Вашого облікового запиÑу."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Цей метод потребує або ÐÐПИСÐТИ, або ВИДÐЛИТИ."
@@ -447,17 +619,17 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
msgid "No status with that ID found."
msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ðадто довго. МакÑимальний розмір допиÑу — %d знаків."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Ðе знайдено"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -473,7 +645,7 @@ msgstr "Формат не підтримуєтьÑÑ."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Обрані від %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… від %2$s / %2$s."
@@ -484,7 +656,7 @@ msgstr "%1$s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… від %2$s / %2$s."
msgid "%s timeline"
msgstr "%s Ñтрічка"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -500,27 +672,22 @@ msgstr "%1$s / Оновленні відповіді %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s оновив цю відповідь на Ð´Ð¾Ð¿Ð¸Ñ Ð²Ñ–Ð´ %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s загальна Ñтрічка"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ уÑÑ–Ñ…!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr "Ð’Ñ‚Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ %s"
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr "Ð’Ñ‚Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Ð’Ñ‚Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ %s"
@@ -530,7 +697,7 @@ msgstr "Ð’Ñ‚Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ %s"
msgid "Notices tagged with %s"
msgstr "ДопиÑи позначені з %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ñ– з %1$s на %2$s!"
@@ -590,8 +757,8 @@ msgstr "Оригінал"
msgid "Preview"
msgstr "ПереглÑд"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Видалити"
@@ -603,30 +770,6 @@ msgstr "Завантажити"
msgid "Crop"
msgstr "Ð’Ñ‚Ñти"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—. Спробуйте знов, будь лаÑка."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "ÐеÑподіване предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð¸."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Оберіть квадратну ділÑнку зображеннÑ, Ñка й буде Вашою автарою."
@@ -665,8 +808,9 @@ msgstr ""
"відпиÑано від ВаÑ, він не зможе підпиÑитаÑть до Ð’Ð°Ñ Ñƒ майбутньому Ñ– Ви "
"більше не отримуватимете жодних допиÑів від нього."
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "ÐÑ–"
@@ -674,13 +818,13 @@ msgstr "ÐÑ–"
msgid "Do not block this user"
msgstr "Ðе блокувати цього кориÑтувача"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Так"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати кориÑтувача"
@@ -763,7 +907,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¾Ñ— адреÑи."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Підтвердити адреÑу"
#: actions/confirmaddress.php:159
@@ -780,10 +924,51 @@ msgstr "Розмова"
msgid "Notices"
msgstr "ДопиÑи"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Ви маєте Ñпочатку увійти, аби мати змогу видалити додаток."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Додаток не виÑвлено."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Ви не Ñ” влаÑником цього додатку."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Видалити додаток"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Впевнені, що бажаєте видалити цей додаток? У базі даних буде знищено вÑÑŽ "
+"інформацію ÑтоÑовно нього, включно із даними про під’єднаних до цього "
+"додатку кориÑтувачів."
+
+#: actions/deleteapplication.php:156
+msgid "Do not delete this application"
+msgstr "Ðе видалÑти додаток"
+
+#: actions/deleteapplication.php:160
+msgid "Delete this application"
+msgstr "Видалити додаток"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -812,7 +997,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей дÐ
msgid "Do not delete this notice"
msgstr "Ðе видалÑти цей допиÑ"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Видалити допиÑ"
@@ -944,16 +1129,6 @@ msgstr "Оновити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° замовчуваннÑм"
msgid "Reset back to default"
msgstr "ПовернутиÑÑŒ до початкових налаштувань"
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Зберегти"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr "Зберегти дизайн"
@@ -966,9 +1141,75 @@ msgstr "Цей Ð´Ð¾Ð¿Ð¸Ñ Ð½Ðµ Ñ” обраним!"
msgid "Add to favorites"
msgstr "Додати до обраних"
-#: actions/doc.php:69
-msgid "No such document."
-msgstr "Такого документа немає."
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Ðемає такого документа «%s»"
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Керувати додатками"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Ви маєте Ñпочатку увійти, аби мати змогу керувати додатком."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Такого додатку немає."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "СкориÑтайтеÑÑŒ цією формою, щоб відредагувати додаток."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Потрібне ім’Ñ."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "Ð†Ð¼â€™Ñ Ð·Ð°Ð´Ð¾Ð²Ð³Ðµ (255 знаків макÑимум)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "Це Ñ–Ð¼â€™Ñ Ð²Ð¶Ðµ викориÑтовуєтьÑÑ. Спробуйте інше."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Потрібен опиÑ."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "URL-адреÑа надто довга."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "URL-адреÑа не Ñ” дійÑною."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Потрібна організаціÑ."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Ðазва організації надто довга (255 знаків макÑимум)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Потрібна Ð´Ð¾Ð¼Ð°ÑˆÐ½Ñ Ñторінка організації."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Форма зворотнього дзвінка надто довга."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "URL-адреÑа Ð´Ð»Ñ Ð·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½ÑŒÐ¾Ð³Ð¾ дзвінка не Ñ” дійÑною."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ додаток."
#: actions/editgroup.php:56
#, php-format
@@ -997,7 +1238,7 @@ msgstr "Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий (%d знаків макÑимум)."
msgid "Could not update group."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ групу."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Ðеможна призначити додаткові імена."
@@ -1038,7 +1279,8 @@ msgstr ""
"Ñпамом також!), там має бути Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· подальшими інÑтрукціÑми."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "СкаÑувати"
@@ -1118,7 +1360,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðе можна полагодити цю поштову адреÑу"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Це недійÑна електронна адреÑа."
@@ -1130,7 +1372,7 @@ msgstr "Це Ñ– Ñ” Вашою адреÑою."
msgid "That email address already belongs to another user."
msgstr "Ð¦Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð° адреÑа належить іншому кориÑтувачу."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ код підтвердженнÑ."
@@ -1192,7 +1434,7 @@ msgstr "Цей Ð´Ð¾Ð¿Ð¸Ñ Ð²Ð¶Ðµ Ñ” обраним!"
msgid "Disfavor favorite"
msgstr "Видалити з обраних"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "ПопулÑрні допиÑи"
@@ -1338,7 +1580,7 @@ msgstr "КориÑтувача заблоковано в цій групі."
msgid "User is not a member of group."
msgstr "КориÑтувач не Ñ” учаÑником групи."
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
msgid "Block user from group"
msgstr "Блокувати кориÑтувача в групі"
@@ -1436,23 +1678,23 @@ msgstr "УчаÑники групи %1$s, Ñторінка %2$d"
msgid "A list of the users in this group."
msgstr "СпиÑок учаÑників цієї групи."
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Ðдмін"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "Блок"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr "Ðадати кориÑтувачеві права адмініÑтратора"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr "Зробити адміном"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr "Ðадати цьому кориÑтувачеві права адмініÑтратора"
@@ -1635,6 +1877,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Це не Ваш Jabber ID."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Вхідні Ð´Ð»Ñ %1$s — Ñторінка %2$d"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1717,7 +1964,7 @@ msgstr "ОÑобиÑті повідомленнÑ"
msgid "Optionally add a personal message to the invitation."
msgstr "Можна додати перÑональне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ (опціонально)."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Так!"
@@ -1818,7 +2065,7 @@ msgstr "Ðеточне Ñ–Ð¼â€™Ñ Ð°Ð±Ð¾ пароль."
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
@@ -1827,17 +2074,6 @@ msgstr "Увійти"
msgid "Login to site"
msgstr "Вхід на Ñайт"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Пароль"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Пам’Ñтати мене"
@@ -1869,22 +2105,22 @@ msgstr ""
"Увійти викриÑтовуючи Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль. Ще не маєте імені кориÑтувача? "
"[ЗареєÑтрувати](%%action.register%%) новий акаунт."
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
"Лише кориÑтувач з правами адмініÑтратора може призначити інших адмінів групи."
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s вже є адміном у групі «%2$s»."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "Ðе можна отримати Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ %1$s щодо членÑтва у групі %2$s."
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Ðе можна надати %1$s права адміна в групі %2$s."
@@ -1893,6 +2129,26 @@ msgstr "Ðе можна надати %1$s права адміна в групі
msgid "No current status"
msgstr "ÐÑ–Ñкого поточного ÑтатуÑу"
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Ðовий додаток"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Ви маєте Ñпочатку увійти, аби мати змогу зареєÑтрувати додаток."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "СкориÑтайтеÑÑŒ цією формою, щоб зареєÑтрувати новий додаток."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Потрібна URL-адреÑа."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Ðе вдалоÑÑ Ñтворити додаток."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ðова група"
@@ -2006,6 +2262,49 @@ msgstr "Спробу «розштовхати» зараховано"
msgid "Nudge sent!"
msgstr "Спробу «розштовхати» зараховано!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Ви повинні увійти, аби переглÑнути ÑпиÑок Ваших додатків."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "Додатки OAuth"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Додатки, Ñкі Ви зареєÑтрували"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Поки що Ви не зареєÑтрували жодних додатків."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Під’єднані додатки"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+"Ви маєте дозволити наÑтупним додаткам доÑтуп до Вашого облікового запиÑу."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Ви не Ñ” кориÑтувачем даного додатку."
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr "Ðе вдалоÑÑ ÑкаÑувати доÑтуп Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÑƒ: "
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Ви не дозволили жодним додаткам викориÑтовувати Ваш акаунт."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr "Розробники можуть змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑ”Ñтрації Ð´Ð»Ñ Ñ—Ñ…Ð½Ñ–Ñ… додатків "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ðµ має профілю"
@@ -2023,8 +2322,8 @@ msgstr "тип зміÑту "
msgid "Only "
msgstr "Лише "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримуєтьÑÑ."
@@ -2037,7 +2336,7 @@ msgid "Notice Search"
msgstr "Пошук допиÑів"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Інші опції"
#: actions/othersettings.php:71
@@ -2088,6 +2387,11 @@ msgstr "Токен Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ визначено Ñк неправильÐ
msgid "Login token expired."
msgstr "Токен Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ втратив чинніÑть."
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Вихідні Ð´Ð»Ñ %1$s — Ñторінка %2$d"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2160,7 +2464,7 @@ msgstr "Ðеможна зберегти новий пароль."
msgid "Password saved."
msgstr "Пароль збережено."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr "ШлÑÑ…"
@@ -2168,132 +2472,148 @@ msgstr "ШлÑÑ…"
msgid "Path and server settings for this StatusNet site."
msgstr "ШлÑÑ… та Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñерверу Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñайту StatusNet."
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s"
msgstr "Дирикторію теми неможна прочитати: %s"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr "ЩоÑÑŒ не так із напиÑаннÑм директорії аватари: %s"
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr "ЩоÑÑŒ не так із напиÑаннÑм директорії фону: %s"
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr "Ðе можу прочитати директорію локалі: %s"
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Помилковий SSL-Ñервер. МакÑимальна довжина 255 знаків."
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr "Сайт"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Сервер"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Ð†Ð¼â€™Ñ Ñ…Ð¾Ñту Ñервера на Ñкому знаходитьÑÑ Ñайт."
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr "ШлÑÑ…"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
msgid "Site path"
msgstr "ШлÑÑ… до Ñайту"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr "ШлÑÑ… до локалей"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ ÑˆÐ»Ñху до локалей"
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr "Ðадзвичайні URL-адреÑи"
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "ВикориÑтовувати надзвичайні (найбільш пам’Ñтні Ñ– визначні) URL-адреÑи?"
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr "Тема"
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr "Сервер теми"
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr "ШлÑÑ… до теми"
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ñ‚ÐµÐ¼Ð¸"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
msgid "Avatars"
msgstr "Ðватари"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
msgid "Avatar server"
msgstr "Сервер аватари"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
msgid "Avatar path"
msgstr "ШлÑÑ… до аватари"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
msgid "Avatar directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€Ð¸"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr "Фони"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr "Сервер фонів"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr "ШлÑÑ… до фонів"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ñ„Ð¾Ð½Ñ–Ð²"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr "SSL-шифруваннÑ"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr "Ðіколи"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr "Іноді"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr "Завжди"
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr "ВикориÑтовувати SSL"
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr "Тоді викориÑтовувати SSL"
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
msgid "SSL server"
msgstr "SSL-Ñервер"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr "Сервер на Ñкий направлÑти SSL-запити"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
msgid "Save paths"
msgstr "Зберегти шлÑхи"
@@ -2356,7 +2676,7 @@ msgid "Full name"
msgstr "Повне ім’Ñ"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Веб-Ñторінка"
@@ -2379,10 +2699,10 @@ msgstr "Про Ñебе"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
-msgstr "ЛокаціÑ"
+msgstr "РозташуваннÑ"
#: actions/profilesettings.php:134 actions/register.php:473
msgid "Where you are, like \"City, State (or Region), Country\""
@@ -2405,7 +2725,7 @@ msgstr ""
"Позначте Ñебе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
"або пробілом"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Мова"
@@ -2432,7 +2752,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (%d знаків макÑимум)."
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "ЧаÑовий поÑÑ Ð½Ðµ обрано."
@@ -2445,23 +2765,23 @@ msgstr "Мова задовга (50 знаків макÑимум)."
msgid "Invalid tag: \"%s\""
msgstr "ÐедійÑний теґ: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¿Ñ–Ð´Ð¿Ð¸Ñки."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ теґи."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¾."
@@ -2483,19 +2803,19 @@ msgstr "Загальний Ñтрічка, Ñторінка %d"
msgid "Public timeline"
msgstr "Загальна Ñтрічка"
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Стрічка публічних допиÑів (RSS 1.0)"
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Стрічка публічних допиÑів (RSS 2.0)"
-#: actions/public.php:159
+#: actions/public.php:167
msgid "Public Stream Feed (Atom)"
msgstr "Стрічка публічних допиÑів (Atom)"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
@@ -2503,11 +2823,11 @@ msgid ""
msgstr ""
"Це публічна Ñтрічка допиÑів Ñайту %%site.name%%, але вона поки що порожнÑ."
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr "Станьте першим! Ðапишіть щоÑÑŒ!"
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
@@ -2515,7 +2835,7 @@ msgstr ""
"Чому б не [зареєÑтруватиÑÑŒ](%%action.register%%) Ñ– не зробити Ñвій перший "
"допиÑ!"
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2529,7 +2849,7 @@ msgstr ""
"розділити Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ð· друзÑми, родиною Ñ– колегами! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%"
"doc.help%%))"
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2567,7 +2887,7 @@ msgstr ""
"Чому б не [зареєÑтруватиÑÑŒ](%%%%action.register%%%%) Ñ– не напиÑати щоÑÑŒ "
"цікаве!"
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "Хмарка теґів"
@@ -2709,7 +3029,7 @@ msgstr "Даруйте, помилка у коді запрошеннÑ."
msgid "Registration successful"
msgstr "РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÑƒÑпішна"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "РеєÑтраціÑ"
@@ -2753,7 +3073,7 @@ msgid "Same as password above. Required."
msgstr "Такий Ñамо, Ñк Ñ– пароль вище. Ðеодмінно."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Пошта"
@@ -2858,7 +3178,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL-адреÑа Вашого профілю на іншому ÑуміÑному ÑервіÑÑ–"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "ПідпиÑатиÑÑŒ"
@@ -2895,7 +3215,7 @@ msgstr "Ви не можете вторувати Ñвоїм влаÑним до
msgid "You already repeated that notice."
msgstr "Ви вже вторували цьому допиÑу."
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "ВторуваннÑ"
@@ -2909,6 +3229,11 @@ msgstr "Вторувати!"
msgid "Replies to %s"
msgstr "Відповіді до %s"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Відповіді до %1$s, Ñторінка %2$d"
+
#: actions/replies.php:144
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2956,6 +3281,10 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Відповіді до %1$s на %2$s!"
+#: actions/rsd.php:146 actions/version.php:157
+msgid "StatusNet"
+msgstr "StatusNet"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
msgstr "Ви не можете нікого ізолювати на цьому Ñайті."
@@ -2964,6 +3293,121 @@ msgstr "Ви не можете нікого ізолювати на цьому Ñ
msgid "User is already sandboxed."
msgstr "КориÑтувача ізольовано доки наберетьÑÑ ÑƒÐ¼Ñƒ-розуму."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr "СеÑÑ–Ñ—"
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑеÑÑ–Ñ— Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñайту StatusNet."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr "СеÑÑ–Ñ— обробки даних"
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr "Обробка даних ÑеÑій ÑамоÑтійно."
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr "СеÑÑ–Ñ Ð½Ð°Ð»Ð°Ð´ÐºÐ¸"
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr "Виводити дані ÑеÑÑ–Ñ— наладки."
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+msgid "Save site settings"
+msgstr "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñайту"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Ви повинні Ñпочатку увійти, аби переглÑнути додаток."
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr "Профіль додатку"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr "Іконка"
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+msgid "Name"
+msgstr "Ім’Ñ"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+msgid "Organization"
+msgstr "ОрганізаціÑ"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "ОпиÑ"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "СтатиÑтика"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr "Створено %1$s — %2$s доÑтуп за замовч. — %3$d кориÑтувачів"
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr "МожливоÑті додатку"
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr "Призначити новий ключ Ñ– таємне Ñлово"
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr "Інфо додатку"
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr "Ключ Ñпоживача"
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr "Таємно Ñлово Ñпоживача"
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr "URL-адреÑа токена запиту"
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr "URL-адреÑа токена дозволу"
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr "Ðвторизувати URL-адреÑу"
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"До уваги: Ð’ÑÑ– підпиÑи шифруютьÑÑ Ð·Ð° методом HMAC-SHA1. Ми не підтримуємо "
+"ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñів відкритим текÑтом."
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Ви впевнені, що бажаєте Ñкинути Ваш ключ Ñпоживача Ñ– таємну фразу?"
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Обрані допиÑи %1$s, Ñторінка %2$d"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Ðе можна відновити обрані допиÑи."
@@ -3021,17 +3465,22 @@ msgstr "Це ÑпоÑіб поділитиÑÑŒ з уÑіма тим, що вам
msgid "%s group"
msgstr "Група %s"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Група %1$s, Ñторінка %2$d"
+
#: actions/showgroup.php:218
msgid "Group profile"
msgstr "Профіль групи"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr "ЗауваженнÑ"
@@ -3077,10 +3526,6 @@ msgstr "(ПуÑто)"
msgid "All members"
msgstr "Ð’ÑÑ– учаÑники"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "СтатиÑтика"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Створено"
@@ -3144,6 +3589,11 @@ msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
msgid " tagged %s"
msgstr " позначено з %s"
+#: actions/showstream.php:79
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s, Ñторінка %2$d"
+
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3169,12 +3619,12 @@ msgstr "Стрічка допиÑів Ð´Ð»Ñ %s (Atom)"
msgid "FOAF for %s"
msgstr "FOAF Ð´Ð»Ñ %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "Це Ñтрічка допиÑів %1$s, але %2$s ще нічого не напиÑав."
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
@@ -3182,7 +3632,7 @@ msgstr ""
"Побачили щоÑÑŒ цікаве нещодавно? Ви ще нічого не напиÑали Ñ– це Ñлушна нагода "
"аби розпочати! :)"
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
@@ -3191,7 +3641,7 @@ msgstr ""
"Ви можете «розштовхати» %1$s або [щоÑÑŒ йому напиÑати](%%%%action.newnotice%%%"
"%?status_textarea=%2$s)."
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3205,7 +3655,7 @@ msgstr ""
"register%%) зараз Ñ– Ñлідкуйте за допиÑами **%s**, також на Ð’Ð°Ñ Ñ‡ÐµÐºÐ°Ñ” багато "
"іншого! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%doc.help%%))"
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3216,7 +3666,7 @@ msgstr ""
"(http://uk.wikipedia.org/wiki/Мікроблоґ), Ñкий працює на вільному "
"програмному забезпеченні [StatusNet](http://status.net/). "
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr "Ð’Ñ‚Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ %s"
@@ -3233,201 +3683,147 @@ msgstr "КориÑтувачу наразі заклеїли рота Ñкотч
msgid "Basic settings for this StatusNet site."
msgstr "Загальні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñайту StatusNet."
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr "Ð†Ð¼â€™Ñ Ñайту не може бути порожнім."
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
msgid "You must have a valid contact email address."
msgstr "Електронна адреÑа має бути чинною."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr "Ðевідома мова «%s»."
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr "Помилковий Ñнепшот URL."
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr "Помилкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñнепшоту."
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr "ЧаÑтота Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð½Ñ Ñнепшотів має міÑтити цифру."
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr "Ліміт текÑтових повідомлень Ñтановить 140 знаків."
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
"ЧаÑове Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ надÑиланні дублікату Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¼Ð°Ñ” Ñтановити від 1 Ñ– "
"більше Ñекунд."
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr "ОÑновні"
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
msgid "Site name"
msgstr "Ðазва Ñайту"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr "Ðазва Вашого Ñайту, штибу \"Мікроблоґи компанії ...\""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr "Ðадано"
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr "ТекÑÑ‚ викориÑтаний Ð´Ð»Ñ Ð¿Ð¾Ñілань кредитів унизу кожної Ñторінки"
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr "Ðаданий URL"
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr "URL викориÑтаний Ð´Ð»Ñ Ð¿Ð¾Ñілань кредитів унизу кожної Ñторінки"
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
msgid "Contact email address for your site"
msgstr "Контактна електронна адреÑа Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ñайту"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
msgid "Local"
msgstr "Локаль"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr "ЧаÑовий поÑÑ Ð·Ð° замовчуваннÑм"
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr "ЧаÑовий поÑÑ Ð·Ð° замовчуваннÑм Ð´Ð»Ñ Ñайту; зазвичай UTC."
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr "Мова Ñайту за замовчуваннÑм"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr "URL-адреÑи"
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr "Сервер"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr "Ð†Ð¼â€™Ñ Ñ…Ð¾Ñту Ñервера на Ñкому знаходитьÑÑ Ñайт."
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr "Ðадзвичайні URL-адреÑи"
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "ВикориÑтовувати надзвичайні (найбільш пам’Ñтні Ñ– визначні) URL-адреÑи?"
-
-#: actions/siteadminpanel.php:318
-msgid "Access"
-msgstr "ПогодитиÑÑŒ"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr "Приватно"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-"Заборонити анонімним відвідувачам (ті, що не увійшли до ÑиÑтеми) переглÑдати "
-"Ñайт?"
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr "Лише за запрошеннÑми"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr "Зробити регіÑтрацію лише за запрошеннÑми."
-
-#: actions/siteadminpanel.php:333
-msgid "Closed"
-msgstr "Закрито"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr "СкаÑувати подальшу регіÑтрацію."
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr "Снепшоти"
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr "Випадково під Ñ‡Ð°Ñ Ð²ÐµÐ±-хіта"
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr "Згідно плану робіт"
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr "Снепшоти даних"
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr "Коли надÑилати ÑтатиÑтичні дані до Ñерверів status.net"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr "ЧаÑтота"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr "Снепшоти надÑилатимутьÑÑ Ñ€Ð°Ð· на N веб-хітів"
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr "Ð—Ð²Ñ–Ñ‚Ð½Ñ URL-адреÑа"
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr "Снепшоти надÑилатимутьÑÑ Ð½Ð° цю URL-адреÑу"
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr "ОбмеженнÑ"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr "ТекÑтові обмеженнÑ"
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr "МакÑимальна кількіÑть знаків у допиÑÑ–."
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr "ЧаÑове обмеженнÑ"
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
"Як довго кориÑтувачі мають зачекати (в Ñекундах) аби надіÑлати той Ñамий "
"Ð´Ð¾Ð¿Ð¸Ñ Ñ‰Ðµ раз."
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-msgid "Save site settings"
-msgstr "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñайту"
-
#: actions/smssettings.php:58
msgid "SMS settings"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐœÐ¡"
@@ -3531,15 +3927,26 @@ msgstr "Код не введено"
msgid "You are not subscribed to that profile."
msgstr "Ви не підпиÑані до цього профілю."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ підпиÑку."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Такого кориÑтувача немає."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Такого файлу немає."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Ви не підпиÑані до цього профілю."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "ПідпиÑані"
@@ -3603,7 +4010,7 @@ msgstr "Тут предÑтавлені ті, за чиїми допиÑами Ð
msgid "These are the people whose notices %s listens to."
msgstr "Тут предÑтавлені ті, за чиїми допиÑами Ñлідкує %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3619,19 +4026,24 @@ msgstr ""
"action.twittersettings%%), то можете автоматично підпиÑатиÑÑŒ до людей, за "
"Ñкими Ñлідкуєте там."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не відÑлідковує нічого"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "ДопиÑи з теґом %1$s, Ñторінка %2$d"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3660,7 +4072,8 @@ msgstr "Позначити %s"
msgid "User profile"
msgstr "Профіль кориÑтувача."
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "Фото"
@@ -3719,7 +4132,7 @@ msgstr "У запиті відÑутній ID профілю."
msgid "Unsubscribed"
msgstr "ВідпиÑано"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3734,85 +4147,65 @@ msgstr "КориÑтувач"
msgid "User settings for this StatusNet site."
msgstr "ВлаÑні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñайту StatusNet."
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr "Помилкове Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð±Ñ–Ð¾. Це мають бути цифри."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Помилковий текÑÑ‚ привітаннÑ. МакÑимальна довжина 255 знаків."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Помилкова підпиÑка за замовчуваннÑм: '%1$s' не Ñ” кориÑтувачем."
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профіль"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr "ÐžÐ±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð±Ñ–Ð¾"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr "МакÑимальна довжина біо кориÑтувача в знаках."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr "Ðові кориÑтувачі"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr "ÐŸÑ€Ð¸Ð²Ñ–Ñ‚Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ кориÑтувача"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr "ТекÑÑ‚ Ð¿Ñ€Ð¸Ð²Ñ–Ñ‚Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… кориÑтувачів (255 знаків)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "ПідпиÑка за замовчуваннÑм"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr "Ðвтоматично підпиÑувати нових кориÑтувачів до цього кориÑтувача."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "ЗапрошеннÑ"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ ÑкаÑовано"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
"Ð’ той чи інший ÑпоÑіб дозволити кориÑтувачам вітати нових кориÑтувачів."
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr "СеÑÑ–Ñ—"
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr "СеÑÑ–Ñ— обробки даних"
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr "Обробка даних ÑеÑій ÑамоÑтійно."
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr "СеÑÑ–Ñ Ð½Ð°Ð»Ð°Ð´ÐºÐ¸"
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr "Виводити дані ÑеÑÑ–Ñ— наладки."
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Ðвторизувати підпиÑку"
@@ -3827,36 +4220,36 @@ msgstr ""
"підпиÑатиÑÑŒ на допиÑи цього кориÑтувача. Якщо Ви не збиралиÑÑŒ підпиÑуватиÑÑŒ "
"ні на чиї допиÑи, проÑто натиÑніть «Відмінити»."
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr "ЛіцензіÑ"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "ПогодитиÑÑŒ"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr "ПідпиÑатиÑÑŒ до цього кориÑтувача"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Забраковано"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
msgid "Reject this subscription"
msgstr "Відмінити цю підпиÑку"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Ðемає запиту на авторизацію!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "ПідпиÑку авторизовано"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3866,11 +4259,11 @@ msgstr ""
"ЗвіртеÑÑŒ з інÑтрукціÑми на Ñайті Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ конкретної інформації про те, Ñк "
"авторизувати підпиÑку. Ваш підпиÑний токен:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "ПідпиÑку Ñкинуто"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3880,37 +4273,37 @@ msgstr ""
"з інÑтрукціÑми на Ñайті Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ конкретної інформації про те, Ñк Ñкинути "
"підпиÑку."
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "URI Ñлухача «%s» тут не знайдено"
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "URI Ñлухача ‘%s’ задовге."
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "URI Ñлухача ‘%s’ це локальний кориÑтувач"
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "URL-адреÑа профілю ‘%s’ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ кориÑтувача."
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "URL-адреÑа автари ‘%s’ помилкова."
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Ðе можна прочитати URL аватари ‘%s’."
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Ðеправильний тип Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ URL-адреÑи аватари ‘%s’."
@@ -3931,6 +4324,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr "ПолаÑуйте бутербродом!"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Групи %1$s, Ñторінка %2$d"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr "Шукати групи ще"
@@ -3960,10 +4358,6 @@ msgstr ""
"Цей Ñайт працює на %1$s, верÑÑ–Ñ %2$s. ÐвторÑькі права 2008-2010 StatusNet, "
"Inc. і розробники."
-#: actions/version.php:157
-msgid "StatusNet"
-msgstr "StatusNet"
-
#: actions/version.php:161
msgid "Contributors"
msgstr "Розробники"
@@ -4005,11 +4399,7 @@ msgstr ""
msgid "Plugins"
msgstr "Додатки"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Ім’Ñ"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "ВерÑÑ–Ñ"
@@ -4017,10 +4407,6 @@ msgstr "ВерÑÑ–Ñ"
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑ"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4041,19 +4427,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Розміри цього файлу перевищують Вашу міÑÑчну квоту на %d байтів."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Профіль групи"
+msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑŒ до групи."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ групу."
+msgstr "Ðе Ñ” чаÑтиною групи."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Профіль групи"
+msgstr "Ðе вдалоÑÑ Ð·Ð°Ð»Ð¸ÑˆÐ¸Ñ‚Ð¸ групу."
#: classes/Login_token.php:76
#, php-format
@@ -4072,27 +4455,27 @@ msgstr "Ðе можна долучити повідомленнÑ."
msgid "Could not update message with new URI."
msgstr "Ðе можна оновити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· новим URI."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Помилка бази даних при додаванні теґу: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Проблема при збереженні допиÑу. Ðадто довге."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при збереженні допиÑу. Ðевідомий кориÑтувач."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Дуже багато допиÑів за короткий термін; ходіть подихайте повітрÑм Ñ– "
"повертайтеÑÑŒ за кілька хвилин."
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4100,34 +4483,57 @@ msgstr ""
"Дуже багато повідомлень за короткий термін; ходіть подихайте повітрÑм Ñ– "
"повертайтеÑÑŒ за кілька хвилин."
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надÑилати допиÑи до цього Ñайту."
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблема при збереженні допиÑу."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Помилка бази даних при додаванні відповіді: %s"
+#: classes/Notice.php:882
+msgid "Problem saving group inbox."
+msgstr "Проблема при збереженні вхідних допиÑів Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¸."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Ð’Ð°Ñ Ð¿Ð¾Ð·Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ можливоÑті підпиÑатиÑÑŒ."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Вже підпиÑаний!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "КориÑтувач заблокував ВаÑ."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Ðе підпиÑано!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Ðе можу видалити ÑамопідпиÑку."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ підпиÑку."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Вітаємо на %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Ðе вдалоÑÑ Ñтворити нову групу."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Ðе вдалоÑÑ Ð²Ñтановити членÑтво."
@@ -4168,128 +4574,124 @@ msgstr "%1$s — %2$s"
msgid "Untitled page"
msgstr "Сторінка без заголовку"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Відправна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Дім"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "ПерÑональний профіль Ñ– Ñтрічка друзів"
-#: lib/action.php:435
-msgid "Account"
-msgstr "Ðкаунт"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адреÑу, аватару, пароль, профіль"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "З’єднаннÑ"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· ÑервіÑами"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Змінити конфігурацію Ñайту"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ЗапроÑити"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "ЗапроÑіть друзів та колег приєднатиÑÑŒ до Ð’Ð°Ñ Ð½Ð° %s"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Вийти"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Вийти з Ñайту"
-#: lib/action.php:457
+#: lib/action.php:463
msgid "Create an account"
msgstr "Створити новий акаунт"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Увійти на Ñайт"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Допомога"
-#: lib/action.php:463
+#: lib/action.php:469
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Пошук"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Пошук людей або текÑтів"
-#: lib/action.php:487
+#: lib/action.php:493
msgid "Site notice"
msgstr "Ð—Ð°ÑƒÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñайту"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "ОглÑд"
-#: lib/action.php:619
+#: lib/action.php:625
msgid "Page notice"
msgstr "Ð—Ð°ÑƒÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñторінки"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "ДругорÑдна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Про"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "ЧаПи"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr "Умови"
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "КонфіденційніÑть"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Джерело"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ StatusNet"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4298,12 +4700,12 @@ msgstr ""
"**%%site.name%%** — це ÑÐµÑ€Ð²Ñ–Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð² наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — це ÑÐµÑ€Ð²Ñ–Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð². "
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4314,33 +4716,56 @@ msgstr ""
"Ð´Ð»Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð², верÑÑ–Ñ %s, доÑтупному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
msgid "Site content license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð·Ð¼Ñ–Ñту Ñайту"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "ЗміÑÑ‚ Ñ– дані %1$s Ñ” приватними Ñ– конфіденційними."
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr "ÐвторÑькі права на зміÑÑ‚ Ñ– дані належать %1$s. Ð’ÑÑ– права захищено."
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"ÐвторÑькі права на зміÑÑ‚ Ñ– дані належать розробникам. Ð’ÑÑ– права захищено."
+
+#: lib/action.php:827
msgid "All "
msgstr "Ð’ÑÑ– "
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "ліцензіÑ."
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "ÐÑƒÐ¼ÐµÑ€Ð°Ñ†Ñ–Ñ Ñторінок"
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1119
+#: lib/action.php:1149
msgid "Before"
msgstr "Ðазад"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
@@ -4370,10 +4795,100 @@ msgstr "ОÑновна ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ñайту"
msgid "Design configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+msgid "User configuration"
+msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
+
+#: lib/adminpanelaction.php:327
+msgid "Access configuration"
+msgstr "ПрийнÑти конфігурацію"
+
+#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑˆÐ»Ñху"
+#: lib/adminpanelaction.php:337
+msgid "Sessions configuration"
+msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑеÑій"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"API-реÑÑƒÑ€Ñ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ” дозвіл типу «читаннÑ-запиÑ», але у Ð²Ð°Ñ Ñ” лише доÑтуп Ð´Ð»Ñ "
+"читаннÑ."
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+"Ðевдала Ñпроба авторизації API, nickname = %1$s, proxy = %2$s, ip = %3$s"
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr "Керувати додатками"
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr "Іконка Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ додатку"
+
+#: lib/applicationeditform.php:204
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Опишіть додаток, вкладаючиÑÑŒ у %d знаків"
+
+#: lib/applicationeditform.php:207
+msgid "Describe your application"
+msgstr "Опишіть Ваш додаток"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr "URL-адреÑа"
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr "URL-адреÑа веб-Ñторінки цього додатку"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "ОрганізаціÑ, відповідальна за цей додаток"
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr "URL-адреÑа веб-Ñторінки організації"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr "URL-адреÑа, на Ñку перенаправлÑти піÑÐ»Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr "Браузер"
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr "ДеÑктоп"
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr "Тип додатку, браузер або деÑктоп"
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr "Лише читаннÑ"
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr "Читати-пиÑати"
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Дозвіл за замовчуваннÑм Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ додатку: лише Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ читати-пиÑати"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Відкликати"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "ВкладеннÑ"
@@ -4394,11 +4909,11 @@ msgstr "ДопиÑи, до Ñких прикріплено це вкладенн
msgid "Tags for this attachment"
msgstr "Теґи Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вкладеннÑ"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ пароль"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr "Змінювати пароль не дозволено"
@@ -4549,84 +5064,94 @@ msgstr "Проблема при збереженні допиÑу."
msgid "Specify the name of the user to subscribe to"
msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, до Ñкого бажаєте підпиÑатиÑÑŒ"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "Такого кориÑтувача немає."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "ПідпиÑано до %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, від Ñкого бажаєте відпиÑатиÑÑŒ"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "ВідпиÑано від %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ще не завершено."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¾."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Ðе можна вимкнути ÑповіщеннÑ."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¾."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Ðе можна увімкнути ÑповіщеннÑ."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Команду входу відключено"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Це поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° викориÑтати лише раз, воно дійÑне протÑгом 2 хвилин: %s"
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ВідпиÑано від %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підпиÑок."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ви підпиÑані до цієї оÑоби:"
msgstr[1] "Ви підпиÑані до цих людей:"
msgstr[2] "Ви підпиÑані до цих людей:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "До Ð’Ð°Ñ Ð½Ñ–Ñ…Ñ‚Ð¾ не підпиÑаний."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ð¦Ñ Ð¾Ñоба Ñ” підпиÑаною до ВаÑ:"
msgstr[1] "Ці люди підпиÑані до ВаÑ:"
msgstr[2] "Ці люди підпиÑані до ВаÑ:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "Ви не Ñ” учаÑником жодної групи."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ви Ñ” учаÑником групи:"
msgstr[1] "Ви Ñ” учаÑником таких груп:"
msgstr[2] "Ви Ñ” учаÑником таких груп:"
-#: lib/command.php:728
+#: lib/command.php:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4640,6 +5165,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4702,19 +5228,19 @@ msgstr ""
"tracks — наразі не виконуєтьÑÑ\n"
"tracking — наразі не виконуєтьÑÑ\n"
-#: lib/common.php:131
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Файлу конфігурації не знайдено. "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Шукав файли конфігурації в цих міÑцÑÑ…: "
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "ЗапуÑтіть файл інÑталÑції, аби полагодити це."
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Іти до файлу інÑталÑції."
@@ -4730,6 +5256,14 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð° допомогою Ñлужби миттєвих
msgid "Updates by SMS"
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· СМС"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "З’єднаннÑ"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Ðвторизовані під’єднані додатки"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Помилка бази даних"
@@ -4915,15 +5449,15 @@ msgstr "Мб"
msgid "kB"
msgstr "кб"
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr "[%s]"
-#: lib/jabber.php:385
-#, fuzzy, php-format
+#: lib/jabber.php:400
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Ðевідома мова «%s»."
+msgstr "Ðевідоме джерело вхідного Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5201,7 +5735,7 @@ msgstr ""
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð°Ð±Ð¸ долучити кориÑтувачів до розмови. Такі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ñ‡Ð¸Ñ‚Ðµ "
"лише Ви."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "від"
@@ -5319,57 +5853,55 @@ msgid "Do not share my location"
msgstr "Приховувати мою локацію"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Сховати інформацію"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Ðа жаль, Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— щодо Вашого міÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð¹Ð¼Ðµ більше "
+"чаÑу, ніж очікувалоÑÑŒ; будь лаÑка, Ñпробуйте пізніше"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Півн."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Півд."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "Сх."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "Зах."
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "в"
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
msgid "in context"
msgstr "в контекÑті"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Вторуванні"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "ВідповіÑти на цей допиÑ"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "ВідповіÑти"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð²Ñ‚Ð¾Ñ€ÑƒÐ²Ð°Ð»Ð¸"
@@ -5401,11 +5933,7 @@ msgstr "Помилка при додаванні віддаленого проф
msgid "Duplicate notice"
msgstr "Дублікат допиÑу"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Ð’Ð°Ñ Ð¿Ð¾Ð·Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ можливоÑті підпиÑатиÑÑŒ."
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ нову підпиÑку."
@@ -5421,19 +5949,19 @@ msgstr "Відповіді"
msgid "Favorites"
msgstr "Обрані"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Вхідні"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Ваші вхідні повідомленнÑ"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Вихідні"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "ÐадіÑлані вами повідомленнÑ"
@@ -5510,6 +6038,10 @@ msgstr "Повторити цей допиÑ?"
msgid "Repeat this notice"
msgstr "Вторувати цьому допиÑу"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr "КориÑтувача Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾ÐºÐ¾Ñ€Ð¸Ñтувацького режиму не визначено."
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr "ПіÑочницÑ"
@@ -5577,34 +6109,6 @@ msgstr "Люди підпиÑані до %s"
msgid "Groups %s is a member of"
msgstr "%s бере учаÑть в цих групах"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Вже підпиÑаний!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "КориÑтувач заблокував ВаÑ."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Ðевдала підпиÑка."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати інших до ВаÑ."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Ðе підпиÑано!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Ðе можу видалити ÑамопідпиÑку."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ підпиÑку."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5655,67 +6159,67 @@ msgstr "Ðватара"
msgid "User actions"
msgstr "ДіÑльніÑть кориÑтувача"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Правка"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "ÐадіÑлати прÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð¼Ñƒ кориÑтувачеві"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "ПовідомленнÑ"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Модерувати"
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "міÑÑць тому"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "близько %d міÑÑців тому"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "рік тому"
@@ -5729,7 +6233,7 @@ msgstr "%s Ñ” неприпуÑтимим кольором!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s неприпуÑтимий колір! ВикориÑтайте 3 або 6 знаків (HEX-формат)"
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 82d4d2037..4dcc58488 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,17 +7,76 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:21+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:57+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "Chấp nhận"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "Thay đổi hình đại diện"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "Äăng ký"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "Riêng tư"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "Thư má»i"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "Ban user"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lưu"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "Thay đổi hình đại diện"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -33,25 +92,29 @@ msgstr "Không có tin nhắn nào."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Không có user nào."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s và bạn bè"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,7 +155,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s và bạn bè"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -115,23 +178,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Phương thức API không tìm thấy!"
@@ -146,7 +209,7 @@ msgstr "Phương thức API không tìm thấy!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "Phương thức này yêu cầu là POST."
@@ -177,8 +240,9 @@ msgstr "Không thể lưu hồ sơ cá nhân."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -303,12 +367,12 @@ msgstr "Không thể cập nhật thành viên."
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "Không thể lấy lại các tin nhắn ưa thích"
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "Không tìm thấy bất kỳ trạng thái nào."
@@ -331,7 +395,8 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
msgid "Not a valid nickname."
msgstr "Biệt hiệu không hợp lệ."
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -343,7 +408,8 @@ msgstr "Trang chủ không phải là URL"
msgid "Full name is too long (max 255 chars)."
msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
@@ -379,7 +445,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Phương thức API không tìm thấy!"
@@ -423,6 +489,115 @@ msgstr "%s và nhóm"
msgid "groups on %s"
msgstr "Mã nhóm"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "Kích thước không hợp lệ."
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "Lỗi xảy ra khi tạo thành viên."
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Bất ngỠgửi mẫu thông tin. "
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+#, fuzzy
+msgid "Account"
+msgstr "Giới thiệu"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Biệt danh"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
@@ -455,17 +630,17 @@ msgstr "Hình đại diện đã được cập nhật."
msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Quá dài. Tối đa là 140 ký tự."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "Không tìm thấy"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -480,7 +655,7 @@ msgstr "Không hỗ trợ kiểu file ảnh này."
msgid "%1$s / Favorites from %2$s"
msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Tất cả các cập nhật của %s"
@@ -491,7 +666,7 @@ msgstr "Tất cả các cập nhật của %s"
msgid "%s timeline"
msgstr "Dòng tin nhắn của %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -507,27 +682,22 @@ msgstr "%1$s / Các cập nhật Ä‘ang trả lá»i tá»›i %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, fuzzy, php-format
msgid "%s public timeline"
msgstr "Dòng tin công cộng"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s cập nhật từ tất cả má»i ngưá»i!"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "Trả lá»i cho %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Trả lá»i cho %s"
@@ -537,7 +707,7 @@ msgstr "Trả lá»i cho %s"
msgid "Notices tagged with %s"
msgstr "Thông báo được gắn thẻ %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Dòng tin nhắn cho %s"
@@ -602,8 +772,8 @@ msgstr ""
msgid "Preview"
msgstr "Xem trước"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -617,29 +787,6 @@ msgstr "Tải file"
msgid "Crop"
msgstr "Nhóm"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Bất ngỠgửi mẫu thông tin. "
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -678,8 +825,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "Không"
@@ -688,13 +836,13 @@ msgstr "Không"
msgid "Do not block this user"
msgstr "Bá» chặn ngưá»i dùng này"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "Có"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ban user"
@@ -780,7 +928,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Không thể xóa email xác nhận."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Xác nhận địa chỉ"
#: actions/confirmaddress.php:159
@@ -798,10 +947,55 @@ msgstr "Không có mã số xác nhận."
msgid "Notices"
msgstr "Tin nhắn"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "Tin nhắn không có hồ sơ cá nhân"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "Không có tin nhắn nào."
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Không thể xóa tin nhắn này."
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "Xóa tin nhắn"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -832,7 +1026,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
msgid "Do not delete this notice"
msgstr "Không thể xóa tin nhắn này."
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -979,16 +1173,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Lưu"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
#, fuzzy
msgid "Save design"
@@ -1004,10 +1188,86 @@ msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích cá»§a bá
msgid "Add to favorites"
msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "Không có tài liệu nào."
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "Tin nhắn không có hồ sơ cá nhân"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Không có tin nhắn nào."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "Mô tả"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Trang chủ không phải là URL"
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "Không thể cập nhật thành viên."
+
#: actions/editgroup.php:56
#, fuzzy, php-format
msgid "Edit %s group"
@@ -1038,7 +1298,7 @@ msgstr "Lý lịch quá dài (không quá 140 ký tự)"
msgid "Could not update group."
msgstr "Không thể cập nhật thành viên."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Không thể tạo favorite."
@@ -1082,7 +1342,8 @@ msgstr ""
"để nhận tin nhắn và lá»i hướng dẫn."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "Há»§y"
@@ -1168,7 +1429,7 @@ msgid "Cannot normalize that email address"
msgstr "Không thể bình thưá»ng hóa địa chỉ GTalk này"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "Äịa chỉ email không hợp lệ."
@@ -1182,7 +1443,7 @@ msgstr "Bạn đã dùng địa chỉ email này rồi"
msgid "That email address already belongs to another user."
msgstr "Äịa chỉ email GTalk này đã có ngưá»i khác sá»­ dụng rồi."
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Không thể chèn mã xác nhận."
@@ -1249,7 +1510,7 @@ msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích cá»§a bá
msgid "Disfavor favorite"
msgstr "Không thích"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1406,7 +1667,7 @@ msgstr "Ngưá»i dùng không có thông tin."
msgid "User is not a member of group."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "Ban user"
@@ -1509,24 +1770,24 @@ msgstr "Thành viên"
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
#, fuzzy
msgid "Make user an admin of the group"
msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
#, fuzzy
msgid "Make this user an admin"
msgstr "Kênh mà bạn tham gia"
@@ -1707,6 +1968,11 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Äây không phải Jabber ID cá»§a bạn."
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Hộp thư đến của %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1790,7 +2056,7 @@ msgstr "Tin nhắn cá nhân"
msgid "Optionally add a personal message to the invitation."
msgstr "Không bắt buá»™c phải thêm thông Ä‘iệp vào thư má»i."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Gá»­i"
@@ -1894,7 +2160,7 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu."
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Äăng nhập"
@@ -1903,17 +2169,6 @@ msgstr "Äăng nhập"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Biệt danh"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Mật khẩu"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Nhớ tôi"
@@ -1944,21 +2199,21 @@ msgstr ""
"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
"bằng [OpenID](%%action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "Ngưá»i dùng không có thông tin."
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
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/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
@@ -1967,6 +2222,29 @@ msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "Không có tin nhắn nào."
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "Không thể tạo favorite."
+
#: actions/newgroup.php:53
#, fuzzy
msgid "New group"
@@ -2081,6 +2359,50 @@ msgstr "Tin đã gửi"
msgid "Nudge sent!"
msgstr "Tin đã gửi"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Tin nhắn không có hồ sơ cá nhân"
@@ -2099,8 +2421,8 @@ msgstr "Kết nối"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -2115,7 +2437,7 @@ msgstr "Tìm kiếm thông báo"
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Thiết lập tài khoản Twitter"
#: actions/othersettings.php:71
@@ -2172,6 +2494,11 @@ msgstr "Nội dung tin nhắn không hợp lệ"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Hộp thư đi của %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2247,7 +2574,7 @@ msgstr "Không thể lưu mật khẩu mới"
msgid "Password saved."
msgstr "Äã lưu mật khẩu."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2255,146 +2582,163 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "Trang này không phải là phương tiện truyá»n thông mà bạn chấp nhận."
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Thư má»i"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "Khôi phục"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "Thông báo mới"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "Hình đại diện"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "Thay đổi hình đại diện"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "Hình đại diện đã được cập nhật."
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "Hình đại diện đã được cập nhật."
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
#, fuzzy
msgid "Backgrounds"
msgstr "Background Theme:"
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
#, fuzzy
msgid "Background server"
msgstr "Background Theme:"
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
#, fuzzy
msgid "Background path"
msgstr "Background Theme:"
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
#, fuzzy
msgid "Background directory"
msgstr "Background Theme:"
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "Khôi phục"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "Tin nhắn"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "Khôi phục"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "Thông báo mới"
@@ -2458,7 +2802,7 @@ msgid "Full name"
msgstr "Tên đầy đủ"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
@@ -2482,7 +2826,7 @@ msgstr "Lý lịch"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Thành phố"
@@ -2506,7 +2850,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "Ngôn ngữ"
@@ -2532,7 +2876,7 @@ msgstr "Tá»± động theo những ngưá»i nào đăng ký theo tôi"
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2546,26 +2890,26 @@ msgstr "Ngôn ngữ quaÌ daÌ€i (tối Ä‘a là 50 ký tá»±)."
msgid "Invalid tag: \"%s\""
msgstr "Trang chủ '%s' không hợp lệ"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
#, fuzzy
msgid "Couldn't update user for autosubscribe."
msgstr "Không thể cập nhật thành viên."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Äã lưu các Ä‘iá»u chỉnh."
@@ -2588,39 +2932,39 @@ msgstr "Dòng tin công cộng"
msgid "Public timeline"
msgstr "Dòng tin công cộng"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "Dòng tin công cộng"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "Dòng tin công cộng"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "Dòng tin công cộng"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2629,7 +2973,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2663,7 +3007,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2803,7 +3147,7 @@ msgstr "Lỗi xảy ra với mã xác nhận."
msgid "Registration successful"
msgstr "Äăng ký thành công"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Äăng ký"
@@ -2846,7 +3190,7 @@ msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2950,7 +3294,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Theo bạn này"
@@ -2991,7 +3335,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoáº
msgid "You already repeated that notice."
msgstr "Bạn đã theo những ngưá»i này:"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Tạo"
@@ -3007,6 +3351,11 @@ msgstr "Tạo"
msgid "Replies to %s"
msgstr "Trả lá»i cho %s"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%s chào mừng bạn "
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -3048,6 +3397,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%s chào mừng bạn "
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Hình đại diện đã được cập nhật."
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -3058,6 +3412,125 @@ msgstr "Bạn đã theo những ngưá»i này:"
msgid "User is already sandboxed."
msgstr "Ngưá»i dùng không có thông tin."
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "Thay đổi hình đại diện"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thư má»i những "
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Tin nhắn không có hồ sơ cá nhân"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Biệt danh"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "Thư má»i đã gá»­i"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Mô tả"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Số liệu thống kê"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Những tin nhắn ưa thích của %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Không thể lấy lại các tin nhắn ưa thích"
@@ -3107,18 +3580,23 @@ msgstr ""
msgid "%s group"
msgstr "%s và nhóm"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Thành viên"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "Thông tin nhóm"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "Tin nhắn"
@@ -3167,10 +3645,6 @@ msgstr ""
msgid "All members"
msgstr "Thành viên"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Số liệu thống kê"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3228,6 +3702,11 @@ msgstr "Tin đã gửi"
msgid " tagged %s"
msgstr "Thông báo được gắn thẻ %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s và bạn bè"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3253,25 +3732,25 @@ msgstr "Dòng tin nhắn cho %s"
msgid "FOAF for %s"
msgstr "Hộp thư đi của %s"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3280,7 +3759,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3288,7 +3767,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "Trả lá»i cho %s"
@@ -3307,206 +3786,148 @@ msgstr "Ngưá»i dùng không có thông tin."
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Äịa chỉ email không hợp lệ."
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "Thông báo mới"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "Dia chi email moi de gui tin nhan den %s"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "Thành phố"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "Ngôn ngữ bạn thích"
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "Khôi phục"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "Chấp nhận"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "Riêng tư"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "Thư má»i"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "Ban user"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "Thay đổi hình đại diện"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3622,17 +4043,27 @@ msgstr "Không có mã nào được nhập"
msgid "You are not subscribed to that profile."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Không thể tạo đăng nhận."
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Không có user nào."
+msgid "No such profile."
+msgstr "Không có tin nhắn nào."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Theo bạn này"
@@ -3693,7 +4124,7 @@ msgstr "Có nhiá»u ngưá»i gá»­i lá»i nhắn để bạn nghe theo."
msgid "These are the people whose notices %s listens to."
msgstr "Có nhiá»u ngưá»i gá»­i lá»i nhắn để %s nghe theo."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3703,20 +4134,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "Không có Jabber ID."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Dòng tin nhắn cho %s"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3747,7 +4183,8 @@ msgstr "Từ khóa"
msgid "User profile"
msgstr "Hồ sơ"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3810,7 +4247,7 @@ msgstr "Không có URL cho hồ sÆ¡ để quay vá»."
msgid "Unsubscribed"
msgstr "Hết theo"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3825,89 +4262,69 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Hồ sơ "
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "Gá»­i thư má»i đến những ngưá»i chưa có tài khoản"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "Tất cả đăng nhận"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "Tá»± động theo những ngưá»i nào đăng ký theo tôi"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "Thư má»i đã gá»­i"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "Thư má»i đã gá»­i"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Äăng nhận cho phép"
@@ -3923,38 +4340,38 @@ msgstr ""
"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
"cá»§a há», hãy nhấn \"Há»§y bá»\""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "Chấp nhận"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "Theo nhóm này"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "Từ chối"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "Tất cả đăng nhận"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "Không có yêu cầu!"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Äăng nhận được phép"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3965,11 +4382,11 @@ msgstr ""
"hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. Äăng nhận token "
"của bạn là:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Äăng nhận từ chối"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3979,37 +4396,37 @@ msgstr ""
"Äăng nhận này đã bị từ chối, nhưng không có URL nào để quay vá». Hãy kiểm tra "
"các hướng dẫn chi tiết trên site để "
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "Không thể Ä‘á»c URL cho hình đại diện '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Kiểu file ảnh không phù hợp với '%s'"
@@ -4029,6 +4446,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Thành viên"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -4055,11 +4477,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "Hình đại diện đã được cập nhật."
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4091,12 +4508,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Biệt danh"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Cá nhân"
@@ -4105,10 +4517,6 @@ msgstr "Cá nhân"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Mô tả"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4161,61 +4569,88 @@ msgstr "Không thể chèn thêm vào đăng nhận."
msgid "Could not update message with new URI."
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, fuzzy, php-format
msgid "DB error inserting hashtag: %s"
msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Ngưá»i dùng không có thông tin."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Chưa đăng nhận!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Không thể xóa đăng nhận."
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Không thể xóa đăng nhận."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s chào mừng bạn "
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Không thể tạo favorite."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Không thể tạo đăng nhận."
@@ -4260,140 +4695,135 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "Trang chá»§"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "Giới thiệu"
-
-#: lib/action.php:435
+#: lib/action.php:441
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "Kết nối"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Tôi theo"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Thư má»i"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Äiá»n địa chỉ email và ná»™i dung tin nhắn để gá»­i thư má»i bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "Thoát"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Tìm kiếm"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:745
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4402,12 +4832,12 @@ msgstr ""
"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:780
+#: lib/action.php:786
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4418,37 +4848,58 @@ msgstr ""
"quyá»n [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Trước"
-#: lib/action.php:1167
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4483,11 +4934,105 @@ msgstr "Xac nhan dia chi email"
msgid "Design configuration"
msgstr "Xác nhận SMS"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "Xác nhận SMS"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "Xác nhận SMS"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "Xác nhận SMS"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Xác nhận SMS"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Nói vỠnhững sở thích của nhóm trong vòng 140 ký tự"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "Nói vỠnhững sở thích của nhóm trong vòng 140 ký tự"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "Nguồn"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL vỠTrang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL vỠTrang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "Xóa"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4509,12 +5054,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "Äã lưu mật khẩu."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Äã lưu mật khẩu."
@@ -4674,82 +5219,92 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Không có user nào."
+
+#: lib/command.php:561
#, fuzzy, php-format
msgid "Subscribed to %s"
msgstr "Theo nhóm này"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, fuzzy, php-format
msgid "Unsubscribed from %s"
msgstr "Hết theo"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
#, fuzzy
msgid "Notification off."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
#, fuzzy
msgid "Notification on."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Hết theo"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những ngưá»i này:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4763,6 +5318,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4790,20 +5346,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Không có mã số xác nhận."
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4819,6 +5375,15 @@ msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
msgid "Updates by SMS"
msgstr "Thay đổi bởi SMS"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Kết nối"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -5020,12 +5585,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5280,7 +5845,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " từ "
@@ -5403,61 +5968,57 @@ msgid "Do not share my location"
msgstr "Không thể lưu hồ sơ cá nhân."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Không"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Không có nội dung!"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Tạo"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
#, fuzzy
msgid "Reply to this notice"
msgstr "Trả lá»i tin nhắn này"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Trả lá»i"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Tin đã gửi"
@@ -5494,11 +6055,7 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
msgid "Duplicate notice"
msgstr "Xóa tin nhắn"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
@@ -5514,19 +6071,19 @@ msgstr "Trả lá»i"
msgid "Favorites"
msgstr "Ưa thích"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "Hộp thư đến"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "Thư đến của bạn"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "Hộp thư đi"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "Thư bạn đã gửi"
@@ -5612,6 +6169,10 @@ msgstr "Trả lá»i tin nhắn này"
msgid "Repeat this notice"
msgstr "Trả lá»i tin nhắn này"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5686,39 +6247,6 @@ msgstr "Theo nhóm này"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Ngưá»i dùng không có thông tin."
-
-#: lib/subs.php:63
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Chưa đăng nhận!"
-
-#: lib/subs.php:82
-#, fuzzy
-msgid "Could not subscribe other to you."
-msgstr "Không thể tạo favorite."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Chưa đăng nhận!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Không thể xóa đăng nhận."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Không thể xóa đăng nhận."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5775,70 +6303,70 @@ msgstr "Hình đại diện"
msgid "User actions"
msgstr "Không tìm thấy action"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Các thiết lập cho Hồ sơ cá nhân"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "Bạn đã theo những ngưá»i này:"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "Tin mới nhất"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "1 giỠtrước"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d giỠtrước"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "1 năm trước"
@@ -5852,7 +6380,7 @@ msgstr "Trang chủ không phải là URL"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 32adff438..60ca89d66 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,17 +10,76 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:24+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:52:00+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "接å—"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "头åƒè®¾ç½®"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "注册"
+
+#: actions/accessadminpanel.php:161
+#, fuzzy
+msgid "Private"
+msgstr "éšç§"
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+#, fuzzy
+msgid "Invite only"
+msgstr "邀请"
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "阻止"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "ä¿å­˜"
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "头åƒè®¾ç½®"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
@@ -35,25 +94,29 @@ msgstr "没有该页é¢"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "没有这个用户。"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s åŠå¥½å‹"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -94,7 +157,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -106,8 +169,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s åŠå¥½å‹"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
@@ -117,23 +180,23 @@ msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 方法未实现ï¼"
@@ -148,7 +211,7 @@ msgstr "API 方法未实现ï¼"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr "此方法接å—POST请求。"
@@ -179,8 +242,9 @@ msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -301,12 +365,12 @@ msgstr "无法更新用户。"
msgid "Two user ids or screen_names must be supplied."
msgstr "å¿…é¡»æä¾›ä¸¤ä¸ªç”¨æˆ·å¸å·æˆ–昵称。"
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "æ— æ³•èŽ·å–æ”¶è—的通告。"
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "找ä¸åˆ°ä»»ä½•ä¿¡æ¯ã€‚"
@@ -329,7 +393,8 @@ msgstr "昵称已被使用,æ¢ä¸€ä¸ªå§ã€‚"
msgid "Not a valid nickname."
msgstr "䏿˜¯æœ‰æ•ˆçš„æ˜µç§°ã€‚"
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -341,7 +406,8 @@ msgstr "主页的URL䏿­£ç¡®ã€‚"
msgid "Full name is too long (max 255 chars)."
msgstr "å…¨å过长(ä¸èƒ½è¶…过 255 个字符)。"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "æè¿°è¿‡é•¿(ä¸èƒ½è¶…过140字符)。"
@@ -377,7 +443,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "API 方法未实现ï¼"
@@ -421,6 +487,115 @@ msgstr "%s 群组"
msgid "groups on %s"
msgstr "组动作"
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "大å°ä¸æ­£ç¡®ã€‚"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "ä¼šè¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•。"
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "ç”¨æˆ·åæˆ–密ç ä¸æ­£ç¡®ã€‚"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "ä¿å­˜ç”¨æˆ·è®¾ç½®æ—¶å‡ºé”™ã€‚"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "添加标签时数æ®åº“出错:%s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "æœªé¢„æ–™çš„è¡¨å•æäº¤ã€‚"
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+msgid "Account"
+msgstr "å¸å·"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "昵称"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "密ç "
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+#, fuzzy
+msgid "Allow"
+msgstr "全部"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "此方法接å—POST或DELETE请求。"
@@ -453,17 +628,17 @@ msgstr "头åƒå·²æ›´æ–°ã€‚"
msgid "No status with that ID found."
msgstr "没有找到此ID的信æ¯ã€‚"
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个字符。"
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr "未找到"
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -478,7 +653,7 @@ msgstr "䏿”¯æŒè¿™ç§å›¾åƒæ ¼å¼ã€‚"
msgid "%1$s / Favorites from %2$s"
msgstr "%s çš„æ”¶è— / %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s æ”¶è—了 %s çš„ %s 通告。"
@@ -489,7 +664,7 @@ msgstr "%s æ”¶è—了 %s çš„ %s 通告。"
msgid "%s timeline"
msgstr "%s 时间表"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -505,27 +680,22 @@ msgstr "%1$s / å›žå¤ %2$s 的消æ¯"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "å›žå¤ %2$s / %3$s çš„ %1$s 更新。"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "æ¥è‡ªæ‰€æœ‰äººçš„ %s 消æ¯ï¼"
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, fuzzy, php-format
msgid "Repeated to %s"
msgstr "%s 的回å¤"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%s 的回å¤"
@@ -535,7 +705,7 @@ msgstr "%s 的回å¤"
msgid "Notices tagged with %s"
msgstr "带 %s 标签的通告"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新ï¼"
@@ -597,8 +767,8 @@ msgstr "原æ¥çš„"
msgid "Preview"
msgstr "预览"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
msgstr "删除"
@@ -611,29 +781,6 @@ msgstr "上传"
msgid "Crop"
msgstr "剪è£"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "ä¼šè¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•。"
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "æœªé¢„æ–™çš„è¡¨å•æäº¤ã€‚"
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "è¯·é€‰æ‹©ä¸€å—æ–¹å½¢åŒºåŸŸä½œä¸ºä½ çš„头åƒ"
@@ -672,8 +819,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr "å¦"
@@ -682,13 +830,13 @@ msgstr "å¦"
msgid "Do not block this user"
msgstr "å–æ¶ˆé˜»æ­¢æ¬¡ç”¨æˆ·"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "是"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
@@ -776,7 +924,8 @@ msgid "Couldn't delete email confirmation."
msgstr "无法删除电å­é‚®ä»¶ç¡®è®¤ã€‚"
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "确认地å€"
#: actions/confirmaddress.php:159
@@ -794,10 +943,55 @@ msgstr "确认ç "
msgid "Notices"
msgstr "通告"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。"
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "通告没有关è”个人信æ¯"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "您未告知此个人信æ¯"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "ä¼šè¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•。"
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "没有这份通告。"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "无法删除通告。"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "删除通告"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -828,7 +1022,7 @@ msgstr "确定è¦åˆ é™¤è¿™æ¡æ¶ˆæ¯å—?"
msgid "Do not delete this notice"
msgstr "无法删除通告。"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -971,16 +1165,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "ä¿å­˜"
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -993,10 +1177,87 @@ msgstr "此通告未被收è—ï¼"
msgid "Add to favorites"
msgstr "加入收è—"
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "没有这份文档。"
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "其他选项"
+
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。"
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "没有这份通告。"
+
+#: actions/editapplication.php:161
+#, fuzzy
+msgid "Use this form to edit your application."
+msgstr "ä½¿ç”¨è¿™ä¸ªè¡¨å•æ¥ç¼–辑组"
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+#, fuzzy
+msgid "Name is required."
+msgstr "相åŒçš„密ç ã€‚此项必填。"
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "å…¨å过长(ä¸èƒ½è¶…过 255 个字符)。"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "昵称已被使用,æ¢ä¸€ä¸ªå§ã€‚"
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "æè¿°"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "主页的URL䏿­£ç¡®ã€‚"
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "ä½ç½®è¿‡é•¿(ä¸èƒ½è¶…过255个字符)。"
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "无法更新组"
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1025,7 +1286,7 @@ msgstr "æè¿°è¿‡é•¿(ä¸èƒ½è¶…过140字符)。"
msgid "Could not update group."
msgstr "无法更新组"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "无法创建收è—。"
@@ -1068,7 +1329,8 @@ msgstr ""
"指示。"
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "å–æ¶ˆ"
@@ -1150,7 +1412,7 @@ msgid "Cannot normalize that email address"
msgstr "无法识别此电å­é‚®ä»¶"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "䏿˜¯æœ‰æ•ˆçš„电å­é‚®ä»¶ã€‚"
@@ -1162,7 +1424,7 @@ msgstr "您已登记此电å­é‚®ä»¶ã€‚"
msgid "That email address already belongs to another user."
msgstr "此电å­é‚®ä»¶å±žäºŽå…¶ä»–用户。"
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "无法æ’入验è¯ç ã€‚"
@@ -1224,7 +1486,7 @@ msgstr "å·²æ”¶è—æ­¤é€šå‘Šï¼"
msgid "Disfavor favorite"
msgstr "å–æ¶ˆæ”¶è—"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1383,7 +1645,7 @@ msgstr "用户没有个人信æ¯ã€‚"
msgid "User is not a member of group."
msgstr "您未告知此个人信æ¯"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "阻止用户"
@@ -1485,25 +1747,25 @@ msgstr "%s 组æˆå‘˜, 第 %d 页"
msgid "A list of the users in this group."
msgstr "该组æˆå‘˜åˆ—表。"
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "admin管ç†å‘˜"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr "阻止"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
#, fuzzy
msgid "Make user an admin of the group"
msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
#, fuzzy
msgid "Make Admin"
msgstr "admin管ç†å‘˜"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1677,6 +1939,11 @@ msgstr "验è¯ç å·²è¢«å‘é€åˆ°æ‚¨æ–°å¢žçš„峿—¶é€šè®¯å¸å·ã€‚您必须å…许
msgid "That is not your Jabber ID."
msgstr "è¿™ä¸æ˜¯æ‚¨çš„Jabberå¸å·ã€‚"
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%s 的收件箱"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1753,7 +2020,7 @@ msgstr "个人消æ¯"
msgid "Optionally add a personal message to the invitation."
msgstr "在邀请中加几å¥è¯(å¯é€‰)。"
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "å‘é€"
@@ -1851,7 +2118,7 @@ msgstr "ç”¨æˆ·åæˆ–密ç ä¸æ­£ç¡®ã€‚"
msgid "Error setting user. You are probably not authorized."
msgstr "未认è¯ã€‚"
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
@@ -1860,17 +2127,6 @@ msgstr "登录"
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "昵称"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "密ç "
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "è®°ä½ç™»å½•状æ€"
@@ -1898,21 +2154,21 @@ msgstr ""
"请使用你的å¸å·å’Œå¯†ç ç™»å…¥ã€‚没有å¸å·ï¼Ÿ[注册](%%action.register%%) 一个新å¸å·, "
"或使用 [OpenID](%%action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "用户没有个人信æ¯ã€‚"
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "无法订阅用户:未找到。"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组"
@@ -1921,6 +2177,30 @@ msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组"
msgid "No current status"
msgstr "没有当å‰çжæ€"
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "没有这份通告。"
+
+#: actions/newapplication.php:64
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。"
+
+#: actions/newapplication.php:143
+#, fuzzy
+msgid "Use this form to register a new application."
+msgstr "使用此表格创建组。"
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "无法创建收è—。"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "新组"
@@ -2028,6 +2308,51 @@ msgstr "振铃呼å«å‘出。"
msgid "Nudge sent!"
msgstr "振铃呼å«å·²ç»å‘出ï¼"
+#: actions/oauthappssettings.php:59
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。"
+
+#: actions/oauthappssettings.php:74
+#, fuzzy
+msgid "OAuth applications"
+msgstr "其他选项"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "您未告知此个人信æ¯"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "通告没有关è”个人信æ¯"
@@ -2046,8 +2371,8 @@ msgstr "连接"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "䏿”¯æŒçš„æ•°æ®æ ¼å¼ã€‚"
@@ -2061,7 +2386,7 @@ msgstr "æœç´¢é€šå‘Š"
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Twitter 设置"
#: actions/othersettings.php:71
@@ -2119,6 +2444,11 @@ msgstr "é€šå‘Šå†…å®¹ä¸æ­£ç¡®"
msgid "Login token expired."
msgstr "登录"
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "%s çš„å‘ä»¶ç®±"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2191,7 +2521,7 @@ msgstr "无法ä¿å­˜æ–°å¯†ç ã€‚"
msgid "Password saved."
msgstr "密ç å·²ä¿å­˜ã€‚"
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2199,142 +2529,159 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "这个页é¢ä¸æä¾›æ‚¨æƒ³è¦çš„媒体类型"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "邀请"
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+#, fuzzy
+msgid "Server"
+msgstr "æ¢å¤"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "新通告"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "头åƒ"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "头åƒè®¾ç½®"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "头åƒå·²æ›´æ–°ã€‚"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "头åƒå·²æ›´æ–°ã€‚"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
#, fuzzy
msgid "SSL"
msgstr "SMS短信"
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
#, fuzzy
msgid "Never"
msgstr "æ¢å¤"
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
#, fuzzy
msgid "Sometimes"
msgstr "通告"
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "æ¢å¤"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "新通告"
@@ -2396,7 +2743,7 @@ msgid "Full name"
msgstr "å…¨å"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
@@ -2420,7 +2767,7 @@ msgstr "自述"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "ä½ç½®"
@@ -2444,7 +2791,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "你的标签 (å­—æ¯letters, æ•°å­—numbers, -, ., å’Œ _), 以逗巿ˆ–空格分隔"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr "语言"
@@ -2470,7 +2817,7 @@ msgstr "自动订阅任何订阅我的更新的人(è¿™ä¸ªé€‰é¡¹æœ€é€‚åˆæœºå™¨äº
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(ä¸èƒ½è¶…过140字符)。"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr "未选择时区。"
@@ -2483,25 +2830,25 @@ msgstr "语言过长(ä¸èƒ½è¶…过50个字符)。"
msgid "Invalid tag: \"%s\""
msgstr "主页'%s'䏿­£ç¡®"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "无法更新用户的自动订阅选项。"
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "设置已ä¿å­˜ã€‚"
@@ -2524,39 +2871,39 @@ msgstr "公开的时间表"
msgid "Public timeline"
msgstr "公开的时间表"
-#: actions/public.php:151
+#: actions/public.php:159
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "公开的èšåˆ"
-#: actions/public.php:155
+#: actions/public.php:163
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "公开的èšåˆ"
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "公开的èšåˆ"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2565,7 +2912,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2601,7 +2948,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "标签云èšé›†"
@@ -2738,7 +3085,7 @@ msgstr "验è¯ç å‡ºé”™ã€‚"
msgid "Registration successful"
msgstr "注册æˆåŠŸã€‚"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -2778,7 +3125,7 @@ msgid "Same as password above. Required."
msgstr "相åŒçš„密ç ã€‚此项必填。"
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "电å­é‚®ä»¶"
@@ -2879,7 +3226,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微åšå®¢æœåŠ¡çš„ä¸ªäººä¿¡æ¯URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "订阅"
@@ -2922,7 +3269,7 @@ msgstr "æ‚¨å¿…é¡»åŒæ„æ­¤æŽˆæƒæ–¹å¯æ³¨å†Œã€‚"
msgid "You already repeated that notice."
msgstr "您已æˆåŠŸé˜»æ­¢è¯¥ç”¨æˆ·ï¼š"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "创建"
@@ -2938,6 +3285,11 @@ msgstr "创建"
msgid "Replies to %s"
msgstr "%s 的回å¤"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "å‘é€ç»™ %1$s çš„ %2$s 消æ¯"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2979,6 +3331,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "å‘é€ç»™ %1$s çš„ %2$s 消æ¯"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "头åƒå·²æ›´æ–°ã€‚"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2989,6 +3346,126 @@ msgstr "æ— æ³•å‘æ­¤ç”¨æˆ·å‘逿¶ˆæ¯ã€‚"
msgid "User is already sandboxed."
msgstr "用户没有个人信æ¯ã€‚"
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "头åƒè®¾ç½®"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "您必须登录æ‰èƒ½é‚€è¯·å…¶ä»–人使用 %s"
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "通告没有关è”个人信æ¯"
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "昵称"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "分页"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "æè¿°"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "统计"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "确定è¦åˆ é™¤è¿™æ¡æ¶ˆæ¯å—?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s æ”¶è—的通告"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "æ— æ³•èŽ·å–æ”¶è—的通告。"
@@ -3038,18 +3515,23 @@ msgstr ""
msgid "%s group"
msgstr "%s 组"
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%s 组æˆå‘˜, 第 %d 页"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "组资料"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL 互è”网地å€"
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "通告"
@@ -3097,10 +3579,6 @@ msgstr "(没有)"
msgid "All members"
msgstr "所有æˆå‘˜"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "统计"
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3160,6 +3638,11 @@ msgstr "消æ¯å·²å‘布。"
msgid " tagged %s"
msgstr "带 %s 标签的通告"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s åŠå¥½å‹"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3185,25 +3668,25 @@ msgstr "%s 的通告èšåˆ"
msgid "FOAF for %s"
msgstr "%s çš„å‘ä»¶ç®±"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "这是 %s 和好å‹çš„æ—¶é—´çº¿ï¼Œä½†æ˜¯æ²¡æœ‰ä»»ä½•人å‘布内容。"
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3212,7 +3695,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3222,7 +3705,7 @@ msgstr ""
"**%s** 有一个å¸å·åœ¨ %%%%site.name%%%%, 一个微åšå®¢æœåŠ¡ [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "%s 的回å¤"
@@ -3241,207 +3724,148 @@ msgstr "用户没有个人信æ¯ã€‚"
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "䏿˜¯æœ‰æ•ˆçš„电å­é‚®ä»¶"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "新通告"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "新的电å­é‚®ä»¶åœ°å€ï¼Œç”¨äºŽå‘布 %s ä¿¡æ¯"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "本地显示"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
#, fuzzy
msgid "Default site language"
msgstr "首选语言"
-#: actions/siteadminpanel.php:303
-#, fuzzy
-msgid "URLs"
-msgstr "URL 互è”网地å€"
-
-#: actions/siteadminpanel.php:306
-#, fuzzy
-msgid "Server"
-msgstr "æ¢å¤"
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "接å—"
-
-#: actions/siteadminpanel.php:321
-#, fuzzy
-msgid "Private"
-msgstr "éšç§"
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-#, fuzzy
-msgid "Invite only"
-msgstr "邀请"
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "阻止"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "头åƒè®¾ç½®"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3548,17 +3972,27 @@ msgstr "没有输入验è¯ç "
msgid "You are not subscribed to that profile."
msgstr "您未告知此个人信æ¯"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "无法删除订阅。"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "没有这个用户。"
+msgid "No such profile."
+msgstr "没有这份通告。"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "您未告知此个人信æ¯"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "订阅"
@@ -3619,7 +4053,7 @@ msgstr "这是您订阅的用户。"
msgid "These are the people whose notices %s listens to."
msgstr "这是 %s 订阅的用户。"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3629,20 +4063,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s 开始关注您的 %2$s ä¿¡æ¯ã€‚"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "没有 Jabber ID。"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS短信"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "用户自加标签 %s - 第 %d 页"
+
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3673,7 +4112,8 @@ msgstr "标签"
msgid "User profile"
msgstr "用户没有个人信æ¯ã€‚"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "相片"
@@ -3737,7 +4177,7 @@ msgstr "æœåŠ¡å™¨æ²¡æœ‰è¿”å›žä¸ªäººä¿¡æ¯URL。"
msgid "Unsubscribed"
msgstr "退订"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3752,89 +4192,69 @@ msgstr "用户"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "个人信æ¯"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
#, fuzzy
msgid "New users"
msgstr "邀请新用户"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "所有订阅"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "自动订阅任何订阅我的更新的人(è¿™ä¸ªé€‰é¡¹æœ€é€‚åˆæœºå™¨äºº)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "å·²å‘é€é‚€è¯·"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
#, fuzzy
msgid "Invitations enabled"
msgstr "å·²å‘é€é‚€è¯·"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "确认订阅"
@@ -3849,39 +4269,39 @@ msgstr ""
"请检查详细信æ¯ï¼Œç¡®è®¤å¸Œæœ›è®¢é˜…æ­¤ç”¨æˆ·çš„é€šå‘Šã€‚å¦‚æžœæ‚¨åˆšæ‰æ²¡æœ‰è¦æ±‚订阅任何人的通"
"告,请点击\"å–æ¶ˆ\"。"
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
#, fuzzy
msgid "License"
msgstr "注册è¯"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "接å—"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "订阅 %s"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "æ‹’ç»"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "所有订阅"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "未收到认è¯è¯·æ±‚ï¼"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "订阅已确认"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3890,11 +4310,11 @@ msgid ""
msgstr ""
"订阅已确认,但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是:"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "订阅被拒ç»"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3902,37 +4322,37 @@ msgid ""
"subscription."
msgstr "订阅已被拒ç»ï¼Œä½†æ˜¯æ²¡æœ‰å›žä¼ URL。请到此网站查看如何拒ç»è®¢é˜…。"
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "无法访问头åƒURL '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "'%s' å›¾åƒæ ¼å¼é”™è¯¯"
@@ -3952,6 +4372,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%s 组æˆå‘˜, 第 %d 页"
+
#: actions/usergroups.php:130
#, fuzzy
msgid "Search for more groups"
@@ -3979,11 +4404,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "头åƒå·²æ›´æ–°ã€‚"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4015,12 +4435,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "昵称"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "个人"
@@ -4029,11 +4444,6 @@ msgstr "个人"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "æè¿°"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4084,61 +4494,89 @@ msgstr "无法添加信æ¯ã€‚"
msgid "Could not update message with new URI."
msgstr "无法添加新URI的信æ¯ã€‚"
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "添加标签时数æ®åº“出错:%s"
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里å‘布了过多的消æ¯ï¼Œè¯·æ·±å‘¼å¸ï¼Œè¿‡å‡ åˆ†é’Ÿå†å‘消æ¯ã€‚"
-#: classes/Notice.php:240
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里å‘布了过多的消æ¯ï¼Œè¯·æ·±å‘¼å¸ï¼Œè¿‡å‡ åˆ†é’Ÿå†å‘消æ¯ã€‚"
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "åœ¨è¿™ä¸ªç½‘ç«™ä½ è¢«ç¦æ­¢å‘布消æ¯ã€‚"
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "æ·»åŠ å›žå¤æ—¶æ•°æ®åº“出错:%s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "那个用户阻止了你的订阅。"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "用户没有个人信æ¯ã€‚"
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "未订阅ï¼"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "无法删除订阅。"
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "无法删除订阅。"
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "å‘é€ç»™ %1$s çš„ %2$s 消æ¯"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "无法创建组。"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "无法删除订阅。"
@@ -4181,137 +4619,133 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "无标题页"
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "主站导航"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "主页"
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "ä¸ªäººèµ„æ–™åŠæœ‹å‹å¹´è¡¨"
-#: lib/action.php:435
-msgid "Account"
-msgstr "å¸å·"
-
-#: lib/action.php:435
+#: lib/action.php:441
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "连接"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "无法é‡å®šå‘到æœåŠ¡å™¨ï¼š%s"
-#: lib/action.php:442
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "主站导航"
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "邀请"
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "ä½¿ç”¨è¿™ä¸ªè¡¨å•æ¥é‚€è¯·å¥½å‹å’ŒåŒäº‹åŠ å…¥ã€‚"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "登出"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "创建新å¸å·"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "帮助"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "æœç´¢"
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:721
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "关于"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "常è§é—®é¢˜FAQ"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr "éšç§"
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr "æ¥æº"
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "è”系人"
-#: lib/action.php:745
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "呼å«"
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet软件注册è¯"
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4320,12 +4754,12 @@ msgstr ""
"**%%site.name%%** 是一个微åšå®¢æœåŠ¡ï¼Œæä¾›è€…为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微åšå®¢æœåŠ¡ã€‚"
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4336,37 +4770,58 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授æƒã€‚"
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册è¯"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr "全部"
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr "注册è¯"
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1111
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« 之åŽ"
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "ä¹‹å‰ Â»"
-#: lib/action.php:1167
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "ä¼šè¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•。"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
#: lib/adminpanelaction.php:96
#, fuzzy
@@ -4403,11 +4858,105 @@ msgstr "电å­é‚®ä»¶åœ°å€ç¡®è®¤"
msgid "Design configuration"
msgstr "SMS短信确认"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "SMS短信确认"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "SMS短信确认"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "SMS短信确认"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "SMS短信确认"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "用ä¸è¶…过140个字符æè¿°æ‚¨è‡ªå·±å’Œæ‚¨çš„爱好"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "用ä¸è¶…过140个字符æè¿°æ‚¨è‡ªå·±å’Œæ‚¨çš„爱好"
+
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "Source URL"
+msgstr "æ¥æº"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "您的主页ã€åšå®¢æˆ–在其他站点的URL"
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "您的主页ã€åšå®¢æˆ–在其他站点的URL"
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+#, fuzzy
+msgid "Revoke"
+msgstr "移除"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4429,12 +4978,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
#, fuzzy
msgid "Password changing failed"
msgstr "密ç å·²ä¿å­˜ã€‚"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
#, fuzzy
msgid "Password changing is not allowed"
msgstr "密ç å·²ä¿å­˜ã€‚"
@@ -4588,80 +5137,89 @@ msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
msgid "Specify the name of the user to subscribe to"
msgstr "指定è¦è®¢é˜…的用户å"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "没有这个用户。"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "订阅 %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "指定è¦å–消订阅的用户å"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "å–æ¶ˆè®¢é˜… %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "通告关闭。"
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "无法关闭通告。"
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "通告开å¯ã€‚"
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "无法开å¯é€šå‘Šã€‚"
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "å–æ¶ˆè®¢é˜… %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信æ¯"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信æ¯"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信æ¯"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4675,6 +5233,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4702,20 +5261,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验è¯ç "
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -4732,6 +5291,15 @@ msgstr "ä½¿ç”¨å³æ—¶é€šè®¯å·¥å…·(IM)æ›´æ–°"
msgid "Updates by SMS"
msgstr "使用SMS短信更新"
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "连接"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4927,12 +5495,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5145,7 +5713,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " 从 "
@@ -5267,62 +5835,58 @@ msgid "Do not share my location"
msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "å¦"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "没有内容ï¼"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "创建"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
#, fuzzy
msgid "Reply to this notice"
msgstr "无法删除通告。"
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "回å¤"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "消æ¯å·²å‘布。"
@@ -5357,12 +5921,7 @@ msgstr "添加远程的个人信æ¯å‡ºé”™"
msgid "Duplicate notice"
msgstr "删除通告"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "那个用户阻止了你的订阅。"
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "无法添加新的订阅。"
@@ -5378,19 +5937,19 @@ msgstr "回å¤"
msgid "Favorites"
msgstr "æ”¶è—夹"
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr "æ”¶ä»¶ç®±"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr "您接收的消æ¯"
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr "å‘ä»¶ç®±"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr "您å‘é€çš„æ¶ˆæ¯"
@@ -5475,6 +6034,10 @@ msgstr "无法删除通告。"
msgid "Repeat this notice"
msgstr "无法删除通告。"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5549,37 +6112,6 @@ msgstr "订阅 %s"
msgid "Groups %s is a member of"
msgstr "%s 组是æˆå‘˜ç»„æˆäº†"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "用户没有个人信æ¯ã€‚"
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "无法订阅。"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "无法订阅他人更新。"
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "未订阅ï¼"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "无法删除订阅。"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "无法删除订阅。"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5637,70 +6169,70 @@ msgstr "头åƒ"
msgid "User actions"
msgstr "未知动作"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "个人设置"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "æ— æ³•å‘æ­¤ç”¨æˆ·å‘逿¶ˆæ¯ã€‚"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "新消æ¯"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "几秒å‰"
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "一分钟å‰"
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟å‰"
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "䏀尿—¶å‰"
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ—¶å‰"
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr "一天å‰"
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d 天å‰"
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr "一个月å‰"
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d 个月å‰"
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr "一年å‰"
@@ -5714,7 +6246,7 @@ msgstr "主页的URL䏿­£ç¡®ã€‚"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "您的消æ¯åŒ…å« %d 个字符,超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个字符。"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 5a6552550..ff517edec 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,17 +7,74 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:27+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:52:03+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#, fuzzy
+msgid "Access"
+msgstr "接å—"
+
+#: actions/accessadminpanel.php:65
+#, fuzzy
+msgid "Site access settings"
+msgstr "ç·šä¸Šå³æ™‚通設定"
+
+#: actions/accessadminpanel.php:158
+#, fuzzy
+msgid "Registration"
+msgstr "所有訂閱"
+
+#: actions/accessadminpanel.php:161
+msgid "Private"
+msgstr ""
+
+#: actions/accessadminpanel.php:163
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/accessadminpanel.php:167
+msgid "Invite only"
+msgstr ""
+
+#: actions/accessadminpanel.php:169
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/accessadminpanel.php:173
+#, fuzzy
+msgid "Closed"
+msgstr "無此使用者"
+
+#: actions/accessadminpanel.php:175
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:336 actions/smssettings.php:181
+#: actions/subscriptions.php:208 actions/tagother.php:154
+#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/accessadminpanel.php:189
+#, fuzzy
+msgid "Save access settings"
+msgstr "ç·šä¸Šå³æ™‚通設定"
+
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
#, fuzzy
@@ -33,25 +90,29 @@ msgstr "無此通知"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
#: actions/showfavorites.php:105 actions/userbyid.php:74
#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "無此使用者"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s與好å‹"
+
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -92,7 +153,7 @@ msgid ""
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -104,8 +165,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s與好å‹"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:122
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -115,23 +176,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "確èªç¢¼éºå¤±"
@@ -146,7 +207,7 @@ msgstr "確èªç¢¼éºå¤±"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:114
+#: actions/apistatusesupdate.php:118
msgid "This method requires a POST."
msgstr ""
@@ -177,8 +238,9 @@ msgstr "無法儲存個人資料"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
msgid ""
@@ -296,12 +358,12 @@ msgstr "無法更新使用者"
msgid "Two user ids or screen_names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:135
+#: actions/apifriendshipsshow.php:134
#, fuzzy
msgid "Could not determine source user."
msgstr "無法更新使用者"
-#: actions/apifriendshipsshow.php:143
+#: actions/apifriendshipsshow.php:142
#, fuzzy
msgid "Could not find target user."
msgstr "無法更新使用者"
@@ -324,7 +386,8 @@ msgstr "此暱稱已有人使用。å†è©¦è©¦çœ‹åˆ¥çš„å§ã€‚"
msgid "Not a valid nickname."
msgstr ""
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:215
+#: actions/editgroup.php:195 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -336,7 +399,8 @@ msgstr "個人首é ä½å€éŒ¯èª¤"
msgid "Full name is too long (max 255 chars)."
msgstr "å…¨åéŽé•·ï¼ˆæœ€å¤š255字元)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "自我介紹éŽé•·(å…±140個字元)"
@@ -372,7 +436,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "ç›®å‰ç„¡è«‹æ±‚"
@@ -415,6 +479,115 @@ msgstr ""
msgid "groups on %s"
msgstr ""
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr ""
+
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+msgid "Invalid token."
+msgstr "尺寸錯誤"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:135
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "使用者å稱或密碼無效"
+
+#: actions/apioauthauthorize.php:159
+#, fuzzy
+msgid "Database error deleting OAuth application user."
+msgstr "使用者設定發生錯誤"
+
+#: actions/apioauthauthorize.php:185
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "增加回覆時,資料庫發生錯誤: %s"
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:441
+#, fuzzy
+msgid "Account"
+msgstr "關於"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "暱稱"
+
+#: actions/apioauthauthorize.php:316 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr ""
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -447,17 +620,17 @@ msgstr "更新個人圖åƒ"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:202
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -471,7 +644,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "&sçš„å¾®åž‹éƒ¨è½æ ¼"
@@ -482,7 +655,7 @@ msgstr "&sçš„å¾®åž‹éƒ¨è½æ ¼"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -498,27 +671,22 @@ msgstr "%1$s的狀態是%2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
-#: actions/apitimelineretweetedbyme.php:112
-#, php-format
-msgid "Repeated by %s"
-msgstr ""
-
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -528,7 +696,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "&sçš„å¾®åž‹éƒ¨è½æ ¼"
@@ -591,8 +759,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:611
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr ""
@@ -604,29 +772,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -665,8 +810,9 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#: actions/groupblock.php:178
msgid "No"
msgstr ""
@@ -675,13 +821,13 @@ msgstr ""
msgid "Do not block this user"
msgstr "無此使用者"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:148
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "無此使用者"
@@ -768,7 +914,8 @@ msgid "Couldn't delete email confirmation."
msgstr "ç„¡æ³•å–æ¶ˆä¿¡ç®±ç¢ºèª"
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "確èªä¿¡ç®±"
#: actions/confirmaddress.php:159
@@ -786,10 +933,54 @@ msgstr "地點"
msgid "Notices"
msgstr ""
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "無法更新使用者"
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "確èªç¢¼éºå¤±"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1197
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "無此通知"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "無此通知"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "請在140個字以內æè¿°ä½ è‡ªå·±èˆ‡ä½ çš„興趣"
+
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -819,7 +1010,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "無此通知"
-#: actions/deletenotice.php:146 lib/noticelist.php:611
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -958,16 +1149,6 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
-#: actions/siteadminpanel.php:388 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:313 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -980,10 +1161,84 @@ msgstr ""
msgid "Add to favorites"
msgstr ""
-#: actions/doc.php:69
-msgid "No such document."
+#: actions/doc.php:158
+#, fuzzy, php-format
+msgid "No such document \"%s\""
msgstr "無此文件"
+#: actions/editapplication.php:54
+#, fuzzy
+msgid "Edit Application"
+msgstr "無此通知"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr ""
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "無此通知"
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr ""
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr ""
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+#, fuzzy
+msgid "Name is too long (max 255 chars)."
+msgstr "å…¨åéŽé•·ï¼ˆæœ€å¤š255字元)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "此暱稱已有人使用。å†è©¦è©¦çœ‹åˆ¥çš„å§ã€‚"
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+#, fuzzy
+msgid "Description is required."
+msgstr "所有訂閱"
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr ""
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "個人首é ä½å€éŒ¯èª¤"
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr ""
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+#, fuzzy
+msgid "Organization is too long (max 255 chars)."
+msgstr "地點éŽé•·ï¼ˆå…±255個字)"
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr ""
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr ""
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr ""
+
+#: actions/editapplication.php:258
+#, fuzzy
+msgid "Could not update application."
+msgstr "無法更新使用者"
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -1012,7 +1267,7 @@ msgstr "自我介紹éŽé•·(å…±140個字元)"
msgid "Could not update group."
msgstr "無法更新使用者"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "無法存å–個人圖åƒè³‡æ–™"
@@ -1053,7 +1308,8 @@ msgid ""
msgstr ""
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:331
+#: lib/applicationeditform.php:332
msgid "Cancel"
msgstr "å–æ¶ˆ"
@@ -1134,7 +1390,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:157
+#: actions/siteadminpanel.php:143
msgid "Not a valid email address."
msgstr "此信箱無效"
@@ -1146,7 +1402,7 @@ msgstr ""
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:319
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "無法輸入確èªç¢¼"
@@ -1205,7 +1461,7 @@ msgstr ""
msgid "Disfavor favorite"
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1355,7 +1611,7 @@ msgstr ""
msgid "User is not a member of group."
msgstr ""
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:316
#, fuzzy
msgid "Block user from group"
msgstr "無此使用者"
@@ -1453,23 +1709,23 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:348 lib/blockform.php:69
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:443
msgid "Make user an admin of the group"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make Admin"
msgstr ""
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:475
msgid "Make this user an admin"
msgstr ""
@@ -1636,6 +1892,11 @@ msgstr "確èªä¿¡å·²å¯„åˆ°ä½ çš„ç·šä¸Šå³æ™‚通信箱。%sé€çµ¦ä½ å¾—訊æ¯è¦å
msgid "That is not your Jabber ID."
msgstr ""
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1712,7 +1973,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr ""
@@ -1786,7 +2047,7 @@ msgstr "使用者å稱或密碼錯誤"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
@@ -1795,17 +2056,6 @@ msgstr "登入"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "暱稱"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr ""
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr ""
@@ -1831,21 +2081,21 @@ msgid ""
"(%%action.register%%) a new account."
msgstr ""
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "無法從 %s 建立OpenID"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "無法從 %s 建立OpenID"
@@ -1854,6 +2104,28 @@ msgstr "無法從 %s 建立OpenID"
msgid "No current status"
msgstr ""
+#: actions/newapplication.php:52
+#, fuzzy
+msgid "New Application"
+msgstr "無此通知"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr ""
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+#, fuzzy
+msgid "Could not create application."
+msgstr "無法存å–個人圖åƒè³‡æ–™"
+
#: actions/newgroup.php:53
msgid "New group"
msgstr ""
@@ -1958,6 +2230,49 @@ msgstr ""
msgid "Nudge sent!"
msgstr ""
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr ""
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr ""
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:175
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
+
+#: actions/oauthconnectionssettings.php:186
+msgid "Unable to revoke access for app: "
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:198
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr ""
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr ""
@@ -1976,8 +2291,8 @@ msgstr "連çµ"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -1991,7 +2306,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "ç·šä¸Šå³æ™‚通設定"
#: actions/othersettings.php:71
@@ -2047,6 +2362,11 @@ msgstr "新訊æ¯"
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -2118,7 +2438,7 @@ msgstr "ç„¡æ³•å­˜å–æ–°å¯†ç¢¼"
msgid "Password saved."
msgstr ""
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
msgid "Paths"
msgstr ""
@@ -2126,138 +2446,154 @@ msgstr ""
msgid "Path and server settings for this StatusNet site."
msgstr ""
-#: actions/pathsadminpanel.php:140
+#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
msgid "Theme directory not readable: %s"
msgstr "個人首é ä½å€éŒ¯èª¤"
-#: actions/pathsadminpanel.php:146
+#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:152
+#: actions/pathsadminpanel.php:169
#, php-format
msgid "Background directory not writable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:160
+#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s"
msgstr ""
-#: actions/pathsadminpanel.php:166
+#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:311
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/pathsadminpanel.php:242
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:221
+#: actions/pathsadminpanel.php:242
#, fuzzy
msgid "Site path"
msgstr "新訊æ¯"
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:225
+#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:232
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:237
+#: actions/pathsadminpanel.php:264
msgid "Theme server"
msgstr ""
-#: actions/pathsadminpanel.php:241
+#: actions/pathsadminpanel.php:268
msgid "Theme path"
msgstr ""
-#: actions/pathsadminpanel.php:245
+#: actions/pathsadminpanel.php:272
msgid "Theme directory"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:279
#, fuzzy
msgid "Avatars"
msgstr "個人圖åƒ"
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:284
#, fuzzy
msgid "Avatar server"
msgstr "ç·šä¸Šå³æ™‚通設定"
-#: actions/pathsadminpanel.php:261
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatar path"
msgstr "更新個人圖åƒ"
-#: actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:292
#, fuzzy
msgid "Avatar directory"
msgstr "更新個人圖åƒ"
-#: actions/pathsadminpanel.php:274
+#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:278
+#: actions/pathsadminpanel.php:305
msgid "Background server"
msgstr ""
-#: actions/pathsadminpanel.php:282
+#: actions/pathsadminpanel.php:309
msgid "Background path"
msgstr ""
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:313
msgid "Background directory"
msgstr ""
-#: actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:320
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
msgid "Never"
msgstr ""
-#: actions/pathsadminpanel.php:297
+#: actions/pathsadminpanel.php:324
msgid "Sometimes"
msgstr ""
-#: actions/pathsadminpanel.php:298
+#: actions/pathsadminpanel.php:325
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:302
+#: actions/pathsadminpanel.php:329
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:303
+#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:335
#, fuzzy
msgid "SSL server"
msgstr "ç·šä¸Šå³æ™‚通設定"
-#: actions/pathsadminpanel.php:309
+#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:352
#, fuzzy
msgid "Save paths"
msgstr "新訊æ¯"
@@ -2316,7 +2652,7 @@ msgid "Full name"
msgstr "å…¨å"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:228 lib/groupeditform.php:161
msgid "Homepage"
msgstr "個人首é "
@@ -2340,7 +2676,7 @@ msgstr "自我介紹"
#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "地點"
@@ -2364,7 +2700,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:294
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
msgid "Language"
msgstr ""
@@ -2390,7 +2726,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹éŽé•·(å…±140個字元)"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:164
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
msgid "Timezone not selected."
msgstr ""
@@ -2403,25 +2739,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "個人首é é€£çµ%s無效"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -2443,37 +2779,37 @@ msgstr ""
msgid "Public timeline"
msgstr ""
-#: actions/public.php:151
+#: actions/public.php:159
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
-#: actions/public.php:155
+#: actions/public.php:163
msgid "Public Stream Feed (RSS 2.0)"
msgstr ""
-#: actions/public.php:159
+#: actions/public.php:167
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "%s的公開內容"
-#: actions/public.php:179
+#: actions/public.php:187
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:190
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:194
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:241
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2482,7 +2818,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:246
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2515,7 +2851,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr ""
@@ -2652,7 +2988,7 @@ msgstr "確èªç¢¼ç™¼ç”ŸéŒ¯èª¤"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2692,7 +3028,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "é›»å­ä¿¡ç®±"
@@ -2777,7 +3113,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -2816,7 +3152,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "無此使用者"
-#: actions/repeat.php:114 lib/noticelist.php:629
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "新增"
@@ -2832,6 +3168,11 @@ msgstr "新增"
msgid "Replies to %s"
msgstr ""
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "&sçš„å¾®åž‹éƒ¨è½æ ¼"
+
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2873,6 +3214,11 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "&sçš„å¾®åž‹éƒ¨è½æ ¼"
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "更新個人圖åƒ"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -2882,6 +3228,123 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
msgid "User is already sandboxed."
msgstr ""
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:336
+msgid "Sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
+#: actions/useradminpanel.php:293
+#, fuzzy
+msgid "Save site settings"
+msgstr "ç·šä¸Šå³æ™‚通設定"
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:169 actions/version.php:195
+#: lib/applicationeditform.php:195
+#, fuzzy
+msgid "Name"
+msgstr "暱稱"
+
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#, fuzzy
+msgid "Organization"
+msgstr "地點"
+
+#: actions/showapplication.php:187 actions/version.php:198
+#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "所有訂閱"
+
+#: actions/showapplication.php:192 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr ""
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s與好å‹"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2931,18 +3394,23 @@ msgstr ""
msgid "%s group"
msgstr ""
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "所有訂閱"
+
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
msgstr "無此通知"
#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/userauthorization.php:187 lib/userprofile.php:194
msgid "Note"
msgstr ""
@@ -2989,10 +3457,6 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr ""
-
#: actions/showgroup.php:432
#, fuzzy
msgid "Created"
@@ -3049,6 +3513,11 @@ msgstr "更新個人圖åƒ"
msgid " tagged %s"
msgstr ""
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s與好å‹"
+
#: actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
@@ -3074,25 +3543,25 @@ msgstr ""
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3101,7 +3570,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3109,7 +3578,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
-#: actions/showstream.php:313
+#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
msgstr ""
@@ -3126,202 +3595,147 @@ msgstr ""
msgid "Basic settings for this StatusNet site."
msgstr ""
-#: actions/siteadminpanel.php:146
+#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:154
+#: actions/siteadminpanel.php:140
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "此信箱無效"
-#: actions/siteadminpanel.php:172
+#: actions/siteadminpanel.php:158
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
-#: actions/siteadminpanel.php:179
+#: actions/siteadminpanel.php:165
msgid "Invalid snapshot report URL."
msgstr ""
-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:171
msgid "Invalid snapshot run value."
msgstr ""
-#: actions/siteadminpanel.php:191
+#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
msgstr ""
-#: actions/siteadminpanel.php:197
+#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:203
+#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:239
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:242
#, fuzzy
msgid "Site name"
msgstr "新訊æ¯"
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:261
+#: actions/siteadminpanel.php:247
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:262
+#: actions/siteadminpanel.php:248
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:252
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:267
+#: actions/siteadminpanel.php:253
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:271
+#: actions/siteadminpanel.php:257
#, fuzzy
msgid "Contact email address for your site"
msgstr "查無此使用者所註冊的信箱"
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:263
#, fuzzy
msgid "Local"
msgstr "地點"
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:274
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:275
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:281
msgid "Default site language"
msgstr ""
-#: actions/siteadminpanel.php:303
-msgid "URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Server"
-msgstr ""
-
-#: actions/siteadminpanel.php:306
-msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:310
-msgid "Fancy URLs"
-msgstr ""
-
-#: actions/siteadminpanel.php:312
-msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
-
-#: actions/siteadminpanel.php:318
-#, fuzzy
-msgid "Access"
-msgstr "接å—"
-
-#: actions/siteadminpanel.php:321
-msgid "Private"
-msgstr ""
-
-#: actions/siteadminpanel.php:323
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#: actions/siteadminpanel.php:327
-msgid "Invite only"
-msgstr ""
-
-#: actions/siteadminpanel.php:329
-msgid "Make registration invitation only."
-msgstr ""
-
-#: actions/siteadminpanel.php:333
-#, fuzzy
-msgid "Closed"
-msgstr "無此使用者"
-
-#: actions/siteadminpanel.php:335
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/siteadminpanel.php:341
+#: actions/siteadminpanel.php:289
msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:344
+#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:345
+#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:347
+#: actions/siteadminpanel.php:295
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:348
+#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:301
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
msgstr ""
-#: actions/siteadminpanel.php:359
+#: actions/siteadminpanel.php:307
msgid "Report URL"
msgstr ""
-#: actions/siteadminpanel.php:360
+#: actions/siteadminpanel.php:308
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:367
+#: actions/siteadminpanel.php:315
msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:370
+#: actions/siteadminpanel.php:318
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:374
+#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
-#, fuzzy
-msgid "Save site settings"
-msgstr "ç·šä¸Šå³æ™‚通設定"
-
#: actions/smssettings.php:58
#, fuzzy
msgid "SMS settings"
@@ -3421,17 +3835,26 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "註冊失敗"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "無此使用者"
+msgid "No such profile."
+msgstr "無此通知"
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "此帳號已註冊"
@@ -3492,7 +3915,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3502,20 +3925,25 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "ç¾åœ¨%1$s在%2$sæˆç‚ºä½ çš„粉絲囉"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "查無此Jabber ID"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "&sçš„å¾®åž‹éƒ¨è½æ ¼"
+
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3546,7 +3974,8 @@ msgstr ""
msgid "User profile"
msgstr "無此通知"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr ""
@@ -3606,7 +4035,7 @@ msgstr "無確èªè«‹æ±‚"
msgid "Unsubscribed"
msgstr "此帳號已註冊"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:62 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -3621,86 +4050,66 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:221
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:230
msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:234
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:240
#, fuzzy
msgid "Default subscription"
msgstr "所有訂閱"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:241
msgid "Automatically subscribe new users to this user."
msgstr ""
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:250
#, fuzzy
msgid "Invitations"
msgstr "地點"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:255
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:265
-msgid "Sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:270
-msgid "Handle sessions"
-msgstr ""
-
-#: actions/useradminpanel.php:272
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
-#: actions/useradminpanel.php:276
-msgid "Session debugging"
-msgstr ""
-
-#: actions/useradminpanel.php:278
-msgid "Turn on debugging output for sessions."
-msgstr ""
-
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "註冊確èª"
@@ -3712,85 +4121,85 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
msgstr ""
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "接å—"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
msgstr ""
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr ""
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "所有訂閱"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "無確èªè«‹æ±‚"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr ""
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr ""
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "ç„¡æ³•è®€å–æ­¤%sURL的圖åƒ"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
@@ -3809,6 +4218,11 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#: actions/usergroups.php:64
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "所有訂閱"
+
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -3835,11 +4249,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "更新個人圖åƒ"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -3871,12 +4280,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "暱稱"
-
-#: actions/version.php:196 lib/action.php:741
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "地點"
@@ -3885,11 +4289,6 @@ msgstr "地點"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "所有訂閱"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3939,61 +4338,87 @@ msgstr ""
msgid "Could not update message with new URI."
msgstr ""
-#: classes/Notice.php:171
+#: classes/Notice.php:157
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:225
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:229
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:234
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:240
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:246
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:305 classes/Notice.php:330
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1052
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "增加回覆時,資料庫發生錯誤: %s"
+#: classes/Notice.php:882
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1407
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "此帳號已註冊"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "無法刪除帳號"
+
+#: classes/Subscription.php:179 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "無法刪除帳號"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "無法存å–個人圖åƒè³‡æ–™"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "註冊失敗"
@@ -4037,134 +4462,129 @@ msgstr "%1$s的狀態是%2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:427
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Home"
msgstr "主é "
-#: lib/action.php:433
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:435
-#, fuzzy
-msgid "Account"
-msgstr "關於"
-
-#: lib/action.php:435
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:438
+#: lib/action.php:444
msgid "Connect"
msgstr "連çµ"
-#: lib/action.php:438
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: lib/action.php:442
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:446 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:447 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout"
msgstr "登出"
-#: lib/action.php:452
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "新增帳號"
-#: lib/action.php:460
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:463 lib/action.php:726
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "求救"
-#: lib/action.php:463
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:466 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:466
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "新訊æ¯"
-#: lib/action.php:553
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:619
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "新訊æ¯"
-#: lib/action.php:721
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:734
msgid "About"
msgstr "關於"
-#: lib/action.php:730
+#: lib/action.php:736
msgid "FAQ"
msgstr "常見å•題"
-#: lib/action.php:734
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:739
+#: lib/action.php:745
msgid "Source"
msgstr ""
-#: lib/action.php:743
+#: lib/action.php:749
msgid "Contact"
msgstr "好å‹åå–®"
-#: lib/action.php:745
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:776
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4173,12 +4593,12 @@ msgstr ""
"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所æä¾›çš„微型"
"éƒ¨è½æ ¼æœå‹™"
-#: lib/action.php:778
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%**æ˜¯å€‹å¾®åž‹éƒ¨è½æ ¼"
-#: lib/action.php:780
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4186,34 +4606,56 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "新訊æ¯"
-#: lib/action.php:803
+#: lib/action.php:806
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:811
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:814
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:808
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "之å‰çš„內容»"
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
msgstr ""
#: lib/adminpanelaction.php:96
@@ -4246,11 +4688,101 @@ msgstr "確èªä¿¡ç®±"
msgid "Design configuration"
msgstr "確èªä¿¡ç®±"
-#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#: lib/adminpanelaction.php:322
+#, fuzzy
+msgid "User configuration"
+msgstr "確èªä¿¡ç®±"
+
+#: lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Access configuration"
+msgstr "確èªä¿¡ç®±"
+
+#: lib/adminpanelaction.php:332
#, fuzzy
msgid "Paths configuration"
msgstr "確èªä¿¡ç®±"
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "確èªä¿¡ç®±"
+
+#: lib/apiauth.php:95
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#: lib/apiauth.php:273
+#, php-format
+msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
+msgstr ""
+
+#: lib/applicationeditform.php:136
+msgid "Edit application"
+msgstr ""
+
+#: lib/applicationeditform.php:184
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:204
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "請在140個字以內æè¿°ä½ è‡ªå·±èˆ‡ä½ çš„興趣"
+
+#: lib/applicationeditform.php:207
+#, fuzzy
+msgid "Describe your application"
+msgstr "請在140個字以內æè¿°ä½ è‡ªå·±èˆ‡ä½ çš„興趣"
+
+#: lib/applicationeditform.php:216
+msgid "Source URL"
+msgstr ""
+
+#: lib/applicationeditform.php:218
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:230
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:236
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:258
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:274
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:275
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:297
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:315
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:316
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4271,11 +4803,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
msgid "Password changing failed"
msgstr ""
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:233
msgid "Password changing is not allowed"
msgstr ""
@@ -4428,80 +4960,90 @@ msgstr "儲存使用者發生錯誤"
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "無此使用者"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "此帳號已註冊"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4515,6 +5057,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4542,20 +5085,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "無確èªç¢¼"
-#: lib/common.php:132
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -4571,6 +5114,15 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "連çµ"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr ""
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr ""
@@ -4759,12 +5311,12 @@ msgstr ""
msgid "kB"
msgstr ""
-#: lib/jabber.php:202
+#: lib/jabber.php:220
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:385
+#: lib/jabber.php:400
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -4969,7 +5521,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5089,59 +5641,55 @@ msgid "Do not share my location"
msgstr "無法儲存個人資料"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "無內容"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "新增"
-#: lib/noticelist.php:585
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:586
+#: lib/noticelist.php:611
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:628
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "更新個人圖åƒ"
@@ -5175,11 +5723,7 @@ msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
msgid "Duplicate notice"
msgstr "新訊æ¯"
-#: lib/oauthstore.php:466 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "無法新增訂閱"
@@ -5195,19 +5739,19 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
msgstr ""
-#: lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
msgid "Outbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:131
msgid "Your sent messages"
msgstr ""
@@ -5288,6 +5832,10 @@ msgstr "無此通知"
msgid "Repeat this notice"
msgstr "無此通知"
+#: lib/router.php:665
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
@@ -5358,36 +5906,6 @@ msgstr "此帳號已註冊"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "此帳號已註冊"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "無法刪除帳號"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "無法刪除帳號"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -5441,68 +5959,68 @@ msgstr "個人圖åƒ"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "ç·šä¸Šå³æ™‚通設定"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:954
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:958
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:962
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:966
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: lib/util.php:970
msgid "about a year ago"
msgstr ""
@@ -5516,7 +6034,7 @@ msgstr "個人首é ä½å€éŒ¯èª¤"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/xmppdaemon.php:301
+#: lib/xmppmanager.php:402
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index 84a2cb616..fb8f7306f 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -22,7 +22,7 @@
* @category Action
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet Inc.
+ * @copyright 2010 StatusNet Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -47,6 +47,55 @@ class BlacklistPlugin extends Plugin
public $nicknames = array();
public $urls = array();
+ public $canAdmin = true;
+
+ private $_nicknamePatterns = array();
+ private $_urlPatterns = array();
+
+ /**
+ * Initialize the plugin
+ *
+ * @return void
+ */
+
+ function initialize()
+ {
+ $confNicknames = $this->_configArray('blacklist', 'nicknames');
+
+ $this->_nicknamePatterns = array_merge($this->nicknames,
+ $confNicknames);
+
+ $confURLs = $this->_configArray('blacklist', 'urls');
+
+ $this->_urlPatterns = array_merge($this->urls,
+ $confURLs);
+ }
+
+ /**
+ * Retrieve an array from configuration
+ *
+ * Carefully checks a section.
+ *
+ * @param string $section Configuration section
+ * @param string $setting Configuration setting
+ *
+ * @return array configuration values
+ */
+
+ function _configArray($section, $setting)
+ {
+ $config = common_config($section, $setting);
+
+ if (empty($config)) {
+ return array();
+ } else if (is_array($config)) {
+ return $config;
+ } else if (is_string($config)) {
+ return explode("\r\n", $config);
+ } else {
+ throw new Exception("Unknown data type for config $section + $setting");
+ }
+ }
/**
* Hook registration to prevent blacklisted homepages or nicknames
@@ -173,7 +222,8 @@ class BlacklistPlugin extends Plugin
private function _checkUrl($url)
{
- foreach ($this->urls as $pattern) {
+ foreach ($this->_urlPatterns as $pattern) {
+ common_debug("Checking $url against $pattern");
if (preg_match("/$pattern/", $url)) {
return false;
}
@@ -194,7 +244,8 @@ class BlacklistPlugin extends Plugin
private function _checkNickname($nickname)
{
- foreach ($this->nicknames as $pattern) {
+ foreach ($this->_nicknamePatterns as $pattern) {
+ common_debug("Checking $nickname against $pattern");
if (preg_match("/$pattern/", $nickname)) {
return false;
}
@@ -203,14 +254,191 @@ class BlacklistPlugin extends Plugin
return true;
}
+ /**
+ * Add our actions to the URL router
+ *
+ * @param Net_URL_Mapper $m URL mapper for this hit
+ *
+ * @return boolean hook return
+ */
+
+ function onRouterInitialized($m)
+ {
+ $m->connect('admin/blacklist', array('action' => 'blacklistadminpanel'));
+ return true;
+ }
+
+ /**
+ * Auto-load our classes if called
+ *
+ * @param string $cls Class to load
+ *
+ * @return boolean hook return
+ */
+
+ function onAutoload($cls)
+ {
+ switch (strtolower($cls))
+ {
+ case 'blacklistadminpanelaction':
+ $base = strtolower(mb_substr($cls, 0, -6));
+ include_once INSTALLDIR.'/plugins/Blacklist/'.$base.'.php';
+ return false;
+ default:
+ return true;
+ }
+ }
+
+ /**
+ * Plugin version data
+ *
+ * @param array &$versions array of version blocks
+ *
+ * @return boolean hook value
+ */
+
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'Blacklist',
'version' => self::VERSION,
'author' => 'Evan Prodromou',
- 'homepage' => 'http://status.net/wiki/Plugin:Blacklist',
+ 'homepage' =>
+ 'http://status.net/wiki/Plugin:Blacklist',
'description' =>
- _m('Keep a blacklist of forbidden nickname and URL patterns.'));
+ _m('Keep a blacklist of forbidden nickname '.
+ 'and URL patterns.'));
+ return true;
+ }
+
+ /**
+ * Determines if our admin panel can be shown
+ *
+ * @param string $name name of the admin panel
+ * @param boolean &$isOK result
+ *
+ * @return boolean hook value
+ */
+
+ function onAdminPanelCheck($name, &$isOK)
+ {
+ if ($name == 'blacklist') {
+ $isOK = $this->canAdmin;
+ return false;
+ }
+
return true;
}
+
+ /**
+ * Add our tab to the admin panel
+ *
+ * @param Widget $nav Admin panel nav
+ *
+ * @return boolean hook value
+ */
+
+ function onEndAdminPanelNav($nav)
+ {
+ if (AdminPanelAction::canAdmin('blacklist')) {
+
+ $action_name = $nav->action->trimmed('action');
+
+ $nav->out->menuItem(common_local_url('blacklistadminpanel'),
+ _('Blacklist'),
+ _('Blacklist configuration'),
+ $action_name == 'blacklistadminpanel',
+ 'nav_blacklist_admin_panel');
+ }
+
+ return true;
+ }
+
+ function onEndDeleteUserForm($action, $user)
+ {
+ $cur = common_current_user();
+
+ if (empty($cur) || !$cur->hasRight(Right::CONFIGURESITE)) {
+ return;
+ }
+
+ $profile = $user->getProfile();
+
+ if (empty($profile)) {
+ return;
+ }
+
+ $action->elementStart('ul', 'form_data');
+ $action->elementStart('li');
+ $this->checkboxAndText($action,
+ 'blacklistnickname',
+ _('Add this nickname pattern to blacklist'),
+ 'blacklistnicknamepattern',
+ $this->patternizeNickname($user->nickname));
+ $action->elementEnd('li');
+
+ if (!empty($profile->homepage)) {
+ $action->elementStart('li');
+ $this->checkboxAndText($action,
+ 'blacklisthomepage',
+ _('Add this homepage pattern to blacklist'),
+ 'blacklisthomepagepattern',
+ $this->patternizeHomepage($profile->homepage));
+ $action->elementEnd('li');
+ }
+
+ $action->elementEnd('ul');
+ }
+
+ function onEndDeleteUser($action, $user)
+ {
+ common_debug("Action args: " . print_r($action->args, true));
+
+ if ($action->boolean('blacklisthomepage')) {
+ $pattern = $action->trimmed('blacklisthomepagepattern');
+ $confURLs = $this->_configArray('blacklist', 'urls');
+ $confURLs[] = $pattern;
+ Config::save('blacklist', 'urls', implode("\r\n", $confURLs));
+ }
+
+ if ($action->boolean('blacklistnickname')) {
+ $pattern = $action->trimmed('blacklistnicknamepattern');
+ $confNicknames = $this->_configArray('blacklist', 'nicknames');
+ $confNicknames[] = $pattern;
+ Config::save('blacklist', 'nicknames', implode("\r\n", $confNicknames));
+ }
+
+ return true;
+ }
+
+ function checkboxAndText($action, $checkID, $label, $textID, $value)
+ {
+ $action->element('input', array('name' => $checkID,
+ 'type' => 'checkbox',
+ 'class' => 'checkbox',
+ 'id' => $checkID));
+
+ $action->text(' ');
+
+ $action->element('label', array('class' => 'checkbox',
+ 'for' => $checkID),
+ $label);
+
+ $action->text(' ');
+
+ $action->element('input', array('name' => $textID,
+ 'type' => 'text',
+ 'id' => $textID,
+ 'value' => $value));
+ }
+
+ function patternizeNickname($nickname)
+ {
+ return $nickname;
+ }
+
+ function patternizeHomepage($homepage)
+ {
+ $hostname = parse_url($homepage, PHP_URL_HOST);
+ return $hostname;
+ }
}
diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php
new file mode 100644
index 000000000..98d07080d
--- /dev/null
+++ b/plugins/Blacklist/blacklistadminpanel.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Blacklist administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Settings
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Administer blacklist
+ *
+ * @category Admin
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+class BlacklistadminpanelAction extends AdminPanelAction
+{
+ /**
+ * title of the admin panel
+ *
+ * @return string title
+ */
+
+ function title()
+ {
+ return _('Blacklist');
+ }
+
+ /**
+ * Panel instructions
+ *
+ * @return string instructions
+ */
+
+ function getInstructions()
+ {
+ return _('Blacklisted URLs and nicknames');
+ }
+
+ /**
+ * Show the actual form
+ *
+ * @return void
+ *
+ * @see BlacklistAdminPanelForm
+ */
+
+ function showForm()
+ {
+ $form = new BlacklistAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save the form settings
+ *
+ * @return void
+ */
+
+ function saveSettings()
+ {
+ static $settings = array(
+ 'blacklist' => array('nicknames', 'urls'),
+ );
+
+ $values = array();
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting] = $this->trimmed("$section-$setting");
+ }
+ }
+
+ // This throws an exception on validation errors
+
+ $this->validate($values);
+
+ // assert(all values are valid);
+
+ $config = new Config();
+
+ $config->query('BEGIN');
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ /**
+ * Validate the values
+ *
+ * @param array &$values 2d array of values to check
+ *
+ * @return boolean success flag
+ */
+
+ function validate(&$values)
+ {
+ return true;
+ }
+}
+
+/**
+ * Admin panel form for blacklist panel
+ *
+ * @category Admin
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+class BlacklistAdminPanelForm extends Form
+{
+ /**
+ * ID of the form
+ *
+ * @return string ID
+ */
+
+ function id()
+ {
+ return 'blacklistadminpanel';
+ }
+
+ /**
+ * Class of the form
+ *
+ * @return string class
+ */
+
+ function formClass()
+ {
+ return 'form_settings';
+ }
+
+ /**
+ * Action we post to
+ *
+ * @return string action URL
+ */
+
+ function action()
+ {
+ return common_local_url('blacklistadminpanel');
+ }
+
+ /**
+ * Show the form controls
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->out->elementStart('li');
+ $this->out->textarea('blacklist-nicknames', _m('Nicknames'),
+ common_config('blacklist', 'nicknames'),
+ _('Patterns of nicknames to block, one per line'));
+ $this->out->elementEnd('li');
+
+ $this->out->elementStart('li');
+ $this->out->textarea('blacklist-urls', _m('URLs'),
+ common_config('blacklist', 'urls'),
+ _('Patterns of URLs to block, one per line'));
+ $this->out->elementEnd('li');
+
+ $this->out->elementEnd('ul');
+ }
+
+ /**
+ * Buttons for submitting
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit('submit',
+ _('Save'),
+ 'submit',
+ null,
+ _('Save site settings'));
+ }
+}
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php
index 51236001a..d52e6006a 100644
--- a/plugins/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNetPlugin.php
@@ -72,8 +72,10 @@ class BlogspamNetPlugin extends Plugin
common_debug("Blogspamnet args = " . print_r($args, TRUE));
$requestBody = xmlrpc_encode_request('testComment', array($args));
- $request = HTTPClient::start();
- $httpResponse = $request->post($this->baseUrl, array('Content-Type: text/xml'), $requestBody);
+ $request = new HTTPClient($this->baseUrl, HTTPClient::METHOD_POST);
+ $request->setHeader('Content-Type', 'text/xml');
+ $request->setBody($requestBody);
+ $httpResponse = $request->send();
$response = xmlrpc_decode($httpResponse->getBody());
if (xmlrpc_is_fault($response)) {
@@ -118,7 +120,7 @@ class BlogspamNetPlugin extends Plugin
$args['site'] = common_root_url();
$args['version'] = $this->userAgent();
- $args['options'] = "max-size=140,min-size=0,min-words=0,exclude=bayasian";
+ $args['options'] = "max-size=" . common_config('site','textlimit') . ",min-size=0,min-words=0,exclude=bayasian";
return $args;
}
diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index a33dfc736..b809c1b8e 100644
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -142,8 +142,6 @@ class MapAction extends OwnerDesignAction
// of refactoring from within a plugin, so I'm just abusing
// the ApiAction method. Don't do this unless you're me!
- require_once(INSTALLDIR.'/lib/api.php');
-
$act = new ApiAction('/dev/null');
$arr = $act->twitterStatusArray($notice, true);
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 9376c048d..720dedd0a 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -43,8 +43,8 @@ class OStatusPlugin extends Plugin
// Discovery actions
$m->connect('.well-known/host-meta',
array('action' => 'hostmeta'));
- $m->connect('main/webfinger',
- array('action' => 'webfinger'));
+ $m->connect('main/xrd',
+ array('action' => 'xrd'));
$m->connect('main/ostatus',
array('action' => 'ostatusinit'));
$m->connect('main/ostatus?nickname=:nickname',
@@ -82,14 +82,14 @@ class OStatusPlugin extends Plugin
$qm->connect('ostatus', 'OStatusQueueHandler');
// Outgoing from our internal PuSH hub
- $qm->connect('hubverify', 'HubVerifyQueueHandler');
+ $qm->connect('hubconf', 'HubConfQueueHandler');
$qm->connect('hubout', 'HubOutQueueHandler');
// Outgoing Salmon replies (when we don't need a return value)
- $qm->connect('salmonout', 'SalmonOutQueueHandler');
+ $qm->connect('salmon', 'SalmonQueueHandler');
// Incoming from a foreign PuSH hub
- $qm->connect('pushinput', 'PushInputQueueHandler');
+ $qm->connect('pushin', 'PushInQueueHandler');
return true;
}
@@ -103,6 +103,20 @@ class OStatusPlugin extends Plugin
}
/**
+ * Add a link header for LRDD Discovery
+ */
+ function onStartShowHTML($action)
+ {
+ if ($action instanceof ShowstreamAction) {
+ $acct = 'acct:'. $action->profile->nickname .'@'. common_config('site', 'server');
+ $url = common_local_url('xrd');
+ $url.= '?uri='. $acct;
+
+ header('Link: <'.$url.'>; rel="'. Discovery::LRDD_REL.'"; type="application/xrd+xml"');
+ }
+ }
+
+ /**
* Set up a PuSH hub link to our internal link for canonical timeline
* Atom feeds for users and groups.
*/
@@ -135,7 +149,8 @@ class OStatusPlugin extends Plugin
// Also, we'll add in the salmon link
$salmon = common_local_url($salmonAction, array('id' => $id));
- $feed->addLink($salmon, array('rel' => 'salmon'));
+ $feed->addLink($salmon, array('rel' => Salmon::NS_REPLIES));
+ $feed->addLink($salmon, array('rel' => Salmon::NS_MENTIONS));
}
return true;
@@ -210,7 +225,7 @@ class OStatusPlugin extends Plugin
*
*/
- function onStartFindMentions($sender, $text, &$mentions)
+ function onEndFindMentions($sender, $text, &$mentions)
{
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
$text,
@@ -221,15 +236,33 @@ class OStatusPlugin extends Plugin
$webfinger = $wmatch[0];
+ $this->log(LOG_INFO, "Checking Webfinger for address '$webfinger'");
+
$oprofile = Ostatus_profile::ensureWebfinger($webfinger);
- if (!empty($oprofile)) {
+ if (empty($oprofile)) {
+
+ $this->log(LOG_INFO, "No Ostatus_profile found for address '$webfinger'");
+
+ } else {
+ $this->log(LOG_INFO, "Ostatus_profile found for address '$webfinger'");
+
+ if ($oprofile->isGroup()) {
+ continue;
+ }
$profile = $oprofile->localProfile();
+ $pos = $wmatch[1];
+ foreach ($mentions as $i => $other) {
+ // If we share a common prefix with a local user, override it!
+ if ($other['position'] == $pos) {
+ unset($mentions[$i]);
+ }
+ }
$mentions[] = array('mentioned' => array($profile),
'text' => $wmatch[0],
- 'position' => $wmatch[1],
+ 'position' => $pos,
'url' => $profile->profileurl);
}
}
@@ -382,7 +415,7 @@ class OStatusPlugin extends Plugin
$act->actor = ActivityObject::fromProfile($subscriber);
$act->object = ActivityObject::fromProfile($other);
- $oprofile->notifyActivity($act);
+ $oprofile->notifyActivity($act, $subscriber);
return true;
}
@@ -430,7 +463,7 @@ class OStatusPlugin extends Plugin
$act->actor = ActivityObject::fromProfile($profile);
$act->object = ActivityObject::fromProfile($other);
- $oprofile->notifyActivity($act);
+ $oprofile->notifyActivity($act, $profile);
return true;
}
@@ -472,7 +505,7 @@ class OStatusPlugin extends Plugin
$member->getBestName(),
$oprofile->getBestName());
- if ($oprofile->notifyActivity($act)) {
+ if ($oprofile->notifyActivity($act, $member)) {
return true;
} else {
$oprofile->garbageCollect();
@@ -522,7 +555,7 @@ class OStatusPlugin extends Plugin
$member->getBestName(),
$oprofile->getBestName());
- $oprofile->notifyActivity($act);
+ $oprofile->notifyActivity($act, $member);
}
}
@@ -565,7 +598,7 @@ class OStatusPlugin extends Plugin
$act->actor = ActivityObject::fromProfile($profile);
$act->object = ActivityObject::fromNotice($notice);
- $oprofile->notifyActivity($act);
+ $oprofile->notifyActivity($act, $profile);
return true;
}
@@ -609,7 +642,7 @@ class OStatusPlugin extends Plugin
$act->actor = ActivityObject::fromProfile($profile);
$act->object = ActivityObject::fromNotice($notice);
- $oprofile->notifyActivity($act);
+ $oprofile->notifyActivity($act, $profile);
return true;
}
@@ -626,7 +659,7 @@ class OStatusPlugin extends Plugin
function onStartUserGroupHomeUrl($group, &$url)
{
- return $this->onStartUserGroupPermalink($group, &$url);
+ return $this->onStartUserGroupPermalink($group, $url);
}
function onStartUserGroupPermalink($group, &$url)
@@ -656,4 +689,51 @@ class OStatusPlugin extends Plugin
return true;
}
+
+ /**
+ * Ping remote profiles with updates to this profile.
+ * Salmon pings are queued for background processing.
+ */
+ function onEndBroadcastProfile(Profile $profile)
+ {
+ $user = User::staticGet('id', $profile->id);
+
+ // Find foreign accounts I'm subscribed to that support Salmon pings.
+ //
+ // @fixme we could run updates through the PuSH feed too,
+ // in which case we can skip Salmon pings to folks who
+ // are also subscribed to me.
+ $sql = "SELECT * FROM ostatus_profile " .
+ "WHERE profile_id IN " .
+ "(SELECT subscribed FROM subscription WHERE subscriber=%d) " .
+ "OR group_id IN " .
+ "(SELECT group_id FROM group_member WHERE profile_id=%d)";
+ $oprofile = new Ostatus_profile();
+ $oprofile->query(sprintf($sql, $profile->id, $profile->id));
+
+ if ($oprofile->N == 0) {
+ common_log(LOG_DEBUG, "No OStatus remote subscribees for $profile->nickname");
+ return true;
+ }
+
+ $act = new Activity();
+
+ $act->verb = ActivityVerb::UPDATE_PROFILE;
+ $act->id = TagURI::mint('update-profile:%d:%s',
+ $profile->id,
+ common_date_iso8601(time()));
+ $act->time = time();
+ $act->title = _m("Profile update");
+ $act->content = sprintf(_m("%s has updated their profile page."),
+ $profile->getBestName());
+
+ $act->actor = ActivityObject::fromProfile($profile);
+ $act->object = $act->actor;
+
+ while ($oprofile->fetch()) {
+ $oprofile->notifyDeferred($act, $profile);
+ }
+
+ return true;
+ }
}
diff --git a/plugins/OStatus/README b/plugins/OStatus/README
index cbf3adbb9..3a98b7b25 100644
--- a/plugins/OStatus/README
+++ b/plugins/OStatus/README
@@ -2,23 +2,33 @@ Plugin to support importing updates from external RSS and Atom feeds into your t
Uses PubSubHubbub for push feed updates; currently non-PuSH feeds cannot be subscribed.
+Configuration options available:
+
+$config['ostatus']['hub']
+ (default internal hub)
+ Set to URL of an external PuSH hub to use it instead of our internal hub.
+
+$config['ostatus']['hub_retries']
+ (default 0)
+ Number of times to retry a PuSH send to consumers if using internal hub
+
+
+For testing, shouldn't be used in production:
+
+$config['ostatus']['skip_signatures']
+ (default use signatures)
+ Disable generation and validation of Salmon magicenv signatures
+
+$config['feedsub']['nohub']
+ (default require hub)
+ Allow low-level feed subscription setup for feeds without hubs.
+ Not actually usable at this stage, OStatus will check for hubs too
+ and we have no polling backend.
+
+
Todo:
-* set feed icon avatar for actual profiles as well as for preview
-* use channel image and/or favicon for avatar?
-* garbage-collect subscriptions that are no longer being used
-* administrative way to kill feeds?
-* functional l10n
-* clean up subscription form look and workflow
-* use ajax for test/preview in subscription form
-* rssCloud support? (Does anything use it that doesn't support PuSH as well?)
-* possibly a polling daemon to support non-PuSH feeds?
-* likely problems with multiple feeds from the same site, such as category feeds on a blog
- (currently each feed would publish a separate notice on a separate profile, but pointing to the same post URI.)
- (could use the local URI I guess, but that's so icky!)
-* problems with Atom feeds that list <link rel="alternate" href="..."/> but don't have the type
- (such as http://atomgen.appspot.com/feed/5 demo feed); currently it's not recognized and we end up with the feed's master URI
-* make it easier to see what you're subscribed to and unsub from things
-* saner treatment of fullname/nickname?
+* fully functional l10n
+* redo non-OStatus feed support
+** rssCloud support?
+** possibly a polling daemon to support non-PuSH feeds?
* make use of tags/categories from feeds
-* update feed profile data when it changes
-* XML_Feed_Parser has major problems with category and link tags; consider replacing?
diff --git a/plugins/OStatus/actions/hostmeta.php b/plugins/OStatus/actions/hostmeta.php
index 850b8a0fe..3d00b98ae 100644
--- a/plugins/OStatus/actions/hostmeta.php
+++ b/plugins/OStatus/actions/hostmeta.php
@@ -31,12 +31,18 @@ class HostMetaAction extends Action
{
parent::handle();
- $w = new Webfinger();
-
-
$domain = common_config('site', 'server');
- $url = common_local_url('webfinger');
+ $url = common_local_url('xrd');
$url.= '?uri={uri}';
- print $w->getHostMeta($domain, $url);
+
+ $xrd = new XRD();
+
+ $xrd = new XRD();
+ $xrd->host = $domain;
+ $xrd->links[] = array('rel' => Discovery::LRDD_REL,
+ 'template' => $url,
+ 'title' => array('Resource Descriptor'));
+
+ print $xrd->toXML();
}
}
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 3f2f6368f..8ba8dcdcc 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -131,9 +131,9 @@ class OStatusInitAction extends Action
function connectWebfinger($acct)
{
- $w = new Webfinger;
+ $disco = new Discovery;
- $result = $w->lookup($acct);
+ $result = $disco->lookup($acct);
if (!$result) {
$this->clientError(_m("Couldn't look up OStatus account profile."));
}
@@ -144,7 +144,7 @@ class OStatusInitAction extends Action
$user = User::staticGet('nickname', $this->nickname);
$target_profile = common_local_url('userbyid', array('id' => $user->id));
- $url = $w->applyTemplate($link['template'], $target_profile);
+ $url = Discovery::applyTemplate($link['template'], $target_profile);
common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
common_redirect($url, 303);
}
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 12832cdcf..aae22f868 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -333,10 +333,18 @@ class OStatusSubAction extends Action
$group = $this->oprofile->localGroup();
if ($user->isMember($group)) {
$this->showForm(_m('Already a member!'));
- } elseif (Group_member::join($this->oprofile->group_id, $user->id)) {
- $this->successGroup();
+ return;
+ }
+ if (Event::handle('StartJoinGroup', array($group, $user))) {
+ $ok = Group_member::join($this->oprofile->group_id, $user->id);
+ if ($ok) {
+ Event::handle('EndJoinGroup', array($group, $user));
+ $this->successGroup();
+ } else {
+ $this->showForm(_m('Remote group join failed!'));
+ }
} else {
- $this->showForm(_m('Remote group join failed!'));
+ $this->showForm(_m('Remote group join aborted!'));
}
} else {
$local = $this->oprofile->localProfile();
diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php
index 4184f0e0c..9a2067b8c 100644
--- a/plugins/OStatus/actions/pushcallback.php
+++ b/plugins/OStatus/actions/pushcallback.php
@@ -68,7 +68,7 @@ class PushCallbackAction extends Action
'post' => $post,
'hmac' => $hmac);
$qm = QueueManager::get();
- $qm->enqueue($data, 'pushinput');
+ $qm->enqueue($data, 'pushin');
}
/**
diff --git a/plugins/OStatus/actions/webfinger.php b/plugins/OStatus/actions/xrd.php
index 34336a903..f574b60ee 100644
--- a/plugins/OStatus/actions/webfinger.php
+++ b/plugins/OStatus/actions/xrd.php
@@ -24,7 +24,7 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-class WebfingerAction extends Action
+class XrdAction extends Action
{
public $uri;
@@ -40,11 +40,11 @@ class WebfingerAction extends Action
function handle()
{
- $acct = Webfinger::normalize($this->uri);
+ $acct = Discovery::normalize($this->uri);
$xrd = new XRD();
- list($nick, $domain) = explode('@', urldecode($acct));
+ list($nick, $domain) = explode('@', substr(urldecode($acct), 5));
$nick = common_canonical_nickname($nick);
$this->user = User::staticGet('nickname', $nick);
@@ -55,20 +55,20 @@ class WebfingerAction extends Action
$xrd->subject = $this->uri;
$xrd->alias[] = common_profile_url($nick);
- $xrd->links[] = array('rel' => Webfinger::PROFILEPAGE,
+ $xrd->links[] = array('rel' => Discovery::PROFILEPAGE,
'type' => 'text/html',
'href' => common_profile_url($nick));
- $xrd->links[] = array('rel' => Webfinger::UPDATESFROM,
+ $xrd->links[] = array('rel' => Discovery::UPDATESFROM,
'href' => common_local_url('ApiTimelineUser',
array('id' => $this->user->id,
'format' => 'atom')),
'type' => 'application/atom+xml');
// hCard
- $xrd->links[] = array('rel' => 'http://microformats.org/profile/hcard',
+ $xrd->links[] = array('rel' => Discovery::HCARD,
'type' => 'text/html',
- 'href' => common_profile_url($nick));
+ 'href' => common_local_url('hcard', array('nickname' => $nick)));
// XFN
$xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
@@ -78,12 +78,16 @@ class WebfingerAction extends Action
$xrd->links[] = array('rel' => 'describedby',
'type' => 'application/rdf+xml',
'href' => common_local_url('foaf',
- array('nickname' => $nick)));
-
- $salmon_url = common_local_url('salmon',
+ array('nickname' => $nick)));
+
+ // Salmon
+ $salmon_url = common_local_url('usersalmon',
array('id' => $this->user->id));
- $xrd->links[] = array('rel' => 'salmon',
+ $xrd->links[] = array('rel' => Salmon::NS_REPLIES,
+ 'href' => $salmon_url);
+
+ $xrd->links[] = array('rel' => Salmon::NS_MENTIONS,
'href' => $salmon_url);
// Get this user's keypair
@@ -91,12 +95,12 @@ class WebfingerAction extends Action
if (!$magickey) {
// No keypair yet, let's generate one.
$magickey = new Magicsig();
- $magickey->generate();
+ $magickey->generate($this->user->id);
}
-
+
$xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL,
- 'href' => 'data:application/magic-public-key;'. $magickey->keypair);
-
+ 'href' => 'data:application/magic-public-key;'. $magickey->toString(false));
+
// TODO - finalize where the redirect should go on the publisher
$url = common_local_url('ostatussub') . '?profile={uri}';
$xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe',
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index eae2928c3..1ac181fee 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -164,7 +164,7 @@ class HubSub extends Memcached_DataObject
'token' => $token,
'retries' => $retries);
$qm = QueueManager::get();
- $qm->enqueue($data, 'hubverify');
+ $qm->enqueue($data, 'hubconf');
}
/**
diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 681aec184..751527c81 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -49,7 +49,8 @@ class Magicsig extends Memcached_DataObject
public /*static*/ function staticGet($k, $v=null)
{
- return parent::staticGet(__CLASS__, $k, $v);
+ $obj = parent::staticGet(__CLASS__, $k, $v);
+ return Magicsig::fromString($obj->keypair);
}
@@ -90,7 +91,7 @@ class Magicsig extends Memcached_DataObject
return parent::insert();
}
- public function generate($key_length = 512)
+ public function generate($user_id, $key_length = 512)
{
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
@@ -101,6 +102,7 @@ class Magicsig extends Memcached_DataObject
$this->_rsa = new Crypt_RSA($params);
PEAR::popErrorHandling();
+ $this->user_id = $user_id;
$this->insert();
}
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 82dbf773d..7b1aec76b 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -33,6 +33,7 @@ class Ostatus_profile extends Memcached_DataObject
public $feeduri;
public $salmonuri;
+ public $avatar; // remote URL of the last avatar we saved
public $created;
public $modified;
@@ -58,6 +59,7 @@ class Ostatus_profile extends Memcached_DataObject
'group_id' => DB_DATAOBJECT_INT,
'feeduri' => DB_DATAOBJECT_STR,
'salmonuri' => DB_DATAOBJECT_STR,
+ 'avatar' => DB_DATAOBJECT_STR,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
}
@@ -74,6 +76,8 @@ class Ostatus_profile extends Memcached_DataObject
255, true, 'UNI'),
new ColumnDef('salmonuri', 'text',
null, true),
+ new ColumnDef('avatar', 'text',
+ null, true),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'datetime',
@@ -146,27 +150,7 @@ class Ostatus_profile extends Memcached_DataObject
function asActivityObject()
{
if ($this->isGroup()) {
- $object = new ActivityObject();
- $object->type = 'http://activitystrea.ms/schema/1.0/group';
- $object->id = $this->uri;
- $self = $this->localGroup();
-
- // @fixme put a standard getAvatar() interface on groups too
- if ($self->homepage_logo) {
- $object->avatar = $self->homepage_logo;
- $map = array('png' => 'image/png',
- 'jpg' => 'image/jpeg',
- 'jpeg' => 'image/jpeg',
- 'gif' => 'image/gif');
- $extension = pathinfo(parse_url($avatarHref, PHP_URL_PATH), PATHINFO_EXTENSION);
- if (isset($map[$extension])) {
- // @fixme this ain't used/saved yet
- $object->avatarType = $map[$extension];
- }
- }
-
- $object->link = $this->uri; // @fixme accurate?
- return $object;
+ return ActivityObject::fromGroup($this->localGroup());
} else {
return ActivityObject::fromProfile($this->localProfile());
}
@@ -185,57 +169,13 @@ class Ostatus_profile extends Memcached_DataObject
*/
function asActivityNoun($element)
{
- $xs = new XMLStringer(true);
- $avatarHref = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
- $avatarType = 'image/png';
if ($this->isGroup()) {
- $type = 'http://activitystrea.ms/schema/1.0/group';
- $self = $this->localGroup();
-
- // @fixme put a standard getAvatar() interface on groups too
- if ($self->homepage_logo) {
- $avatarHref = $self->homepage_logo;
- $map = array('png' => 'image/png',
- 'jpg' => 'image/jpeg',
- 'jpeg' => 'image/jpeg',
- 'gif' => 'image/gif');
- $extension = pathinfo(parse_url($avatarHref, PHP_URL_PATH), PATHINFO_EXTENSION);
- if (isset($map[$extension])) {
- $avatarType = $map[$extension];
- }
- }
+ $noun = ActivityObject::fromGroup($this->localGroup());
+ return $noun->asString('activity:' . $element);
} else {
- $type = 'http://activitystrea.ms/schema/1.0/person';
- $self = $this->localProfile();
- $avatar = $self->getAvatar(AVATAR_PROFILE_SIZE);
- if ($avatar) {
- $avatarHref = $avatar->url;
- $avatarType = $avatar->mediatype;
- }
+ $noun = ActivityObject::fromProfile($this->localProfile());
+ return $noun->asString('activity:' . $element);
}
- $xs->elementStart('activity:' . $element);
- $xs->element(
- 'activity:object-type',
- null,
- $type
- );
- $xs->element(
- 'id',
- null,
- $this->uri); // ?
- $xs->element('title', null, $self->getBestName());
-
- $xs->element(
- 'link', array(
- 'type' => $avatarType,
- 'href' => $avatarHref
- ),
- ''
- );
-
- $xs->elementEnd('activity:' . $element);
-
- return $xs->getString();
}
/**
@@ -295,18 +235,9 @@ class Ostatus_profile extends Memcached_DataObject
throw new ServerException("Remote groups can't subscribe to local users");
}
- // @fixme use regular channels for subbing, once they accept remote profiles
- $sub = new Subscription();
- $sub->subscriber = $this->profile_id;
- $sub->subscribed = $user->id;
- $sub->created = common_sql_now(); // current time
+ Subscription::start($this->localProfile(), $user->getProfile());
- if ($sub->insert()) {
- // @fixme use subs_notify() if refactored to take profiles?
- mail_subscribe_notify_profile($user, $this->localProfile());
- return true;
- }
- return false;
+ return true;
}
/**
@@ -337,6 +268,9 @@ class Ostatus_profile extends Memcached_DataObject
*/
public function unsubscribe() {
$feedsub = FeedSub::staticGet('uri', $this->feeduri);
+ if (!$feedsub) {
+ return true;
+ }
if ($feedsub->sub_state == 'active') {
return $feedsub->unsubscribe();
} else if ($feedsub->sub_state == '' || $feedsub->sub_state == 'inactive' || $feedsub->sub_state == 'unsubscribe') {
@@ -361,7 +295,7 @@ class Ostatus_profile extends Memcached_DataObject
$count = $this->localProfile()->subscriberCount();
}
if ($count == 0) {
- common_log(LOG_INFO, "Unsubscribing from now-unused remote feed $oprofile->feeduri");
+ common_log(LOG_INFO, "Unsubscribing from now-unused remote feed $this->feeduri");
$this->unsubscribe();
return true;
} else {
@@ -403,7 +337,8 @@ class Ostatus_profile extends Memcached_DataObject
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
'xmlns:georss' => 'http://www.georss.org/georss',
'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
- 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0');
+ 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
+ 'xmlns:media' => 'http://purl.org/syndication/atommedia');
$entry = new XMLStringer();
$entry->elementStart('entry', $attributes);
@@ -422,26 +357,63 @@ class Ostatus_profile extends Memcached_DataObject
common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml");
$salmon = new Salmon(); // ?
- return $salmon->post($this->salmonuri, $xml);
+ return $salmon->post($this->salmonuri, $xml, $actor);
}
return false;
}
- public function notifyActivity($activity)
+ /**
+ * Send a Salmon notification ping immediately, and confirm that we got
+ * an acceptable response from the remote site.
+ *
+ * @param mixed $entry XML string, Notice, or Activity
+ * @return boolean success
+ */
+ public function notifyActivity($entry, $actor)
{
if ($this->salmonuri) {
+ $salmon = new Salmon();
+ return $salmon->post($this->salmonuri, $this->notifyPrepXml($entry), $actor);
+ }
- $xml = '<?xml version="1.0" encoding="UTF-8" ?' . '>' .
- $activity->asString(true);
+ return false;
+ }
- $salmon = new Salmon(); // ?
+ /**
+ * Queue a Salmon notification for later. If queues are disabled we'll
+ * send immediately but won't get the return value.
+ *
+ * @param mixed $entry XML string, Notice, or Activity
+ * @return boolean success
+ */
+ public function notifyDeferred($entry, $actor)
+ {
+ if ($this->salmonuri) {
+ $data = array('salmonuri' => $this->salmonuri,
+ 'entry' => $this->notifyPrepXml($entry),
+ 'actor' => $actor->id);
- return $salmon->post($this->salmonuri, $xml);
+ $qm = QueueManager::get();
+ return $qm->enqueue($data, 'salmon');
}
return false;
}
+ protected function notifyPrepXml($entry)
+ {
+ $preamble = '<?xml version="1.0" encoding="UTF-8" ?' . '>';
+ if (is_string($entry)) {
+ return $entry;
+ } else if ($entry instanceof Activity) {
+ return $preamble . $entry->asString(true);
+ } else if ($entry instanceof Notice) {
+ return $preamble . $entry->asAtomEntry(true, true);
+ } else {
+ throw new ServerException("Invalid type passed to Ostatus_profile::notify; must be XML string or Activity entry");
+ }
+ }
+
function getBestName()
{
if ($this->isGroup()) {
@@ -451,36 +423,6 @@ class Ostatus_profile extends Memcached_DataObject
}
}
- function atomFeed($actor)
- {
- $feed = new Atom10Feed();
- // @fixme should these be set up somewhere else?
- $feed->addNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
- $feed->addNamespace('thr', 'http://purl.org/syndication/thread/1.0');
- $feed->addNamespace('georss', 'http://www.georss.org/georss');
- $feed->addNamespace('ostatus', 'http://ostatus.org/schema/1.0');
-
- $taguribase = common_config('integration', 'taguri');
- $feed->setId("tag:{$taguribase}:UserTimeline:{$actor->id}"); // ???
-
- $feed->setTitle($actor->getBestName() . ' timeline'); // @fixme
- $feed->setUpdated(time());
- $feed->setPublished(time());
-
- $feed->addLink(common_local_url('ApiTimelineUser',
- array('id' => $actor->id,
- 'type' => 'atom')),
- array('rel' => 'self',
- 'type' => 'application/atom+xml'));
-
- $feed->addLink(common_local_url('userbyid',
- array('id' => $actor->id)),
- array('rel' => 'alternate',
- 'type' => 'text/html'));
-
- return $feed;
- }
-
/**
* Read and post notices for updates from the feed.
* Currently assumes that all items in the feed are new,
@@ -543,7 +485,8 @@ class Ostatus_profile extends Memcached_DataObject
// through PuSH setup or Salmon signature checks.
$actorUri = self::getActorProfileURI($activity);
if ($actorUri == $this->uri) {
- // @fixme check if profile info has changed and update it
+ // Check if profile info has changed and update it
+ $this->updateFromActivityObject($activity->actor);
} else {
common_log(LOG_WARNING, "OStatus: skipping post with bad author: got $actorUri expected $this->uri");
return false;
@@ -575,12 +518,39 @@ class Ostatus_profile extends Memcached_DataObject
$rendered = $this->purify($activity->object->content);
$content = html_entity_decode(strip_tags($rendered));
+ $shortened = common_shorten_links($content);
+
+ // If it's too long, try using the summary, and make the
+ // HTML an attachment.
+
+ $attachment = null;
+
+ if (Notice::contentTooLong($shortened)) {
+ $attachment = $this->saveHTMLFile($activity->object->title, $rendered);
+ $summary = $activity->object->summary;
+ if (empty($summary)) {
+ $summary = $content;
+ }
+ $shortSummary = common_shorten_links($summary);
+ if (Notice::contentTooLong($shortSummary)) {
+ $url = common_shorten_url(common_local_url('attachment',
+ array('attachment' => $attachment->id)));
+ $shortSummary = substr($shortSummary,
+ 0,
+ Notice::maxContent() - (mb_strlen($url) + 2));
+ $shortSummary .= '… ' . $url;
+ $content = $shortSummary;
+ $rendered = common_render_text($content);
+ }
+ }
+
$options = array('is_local' => Notice::REMOTE_OMB,
'url' => $sourceUrl,
'uri' => $sourceUri,
'rendered' => $rendered,
'replies' => array(),
- 'groups' => array());
+ 'groups' => array(),
+ 'tags' => array());
// Check for optional attributes...
@@ -615,6 +585,16 @@ class Ostatus_profile extends Memcached_DataObject
}
}
+ // Atom categories <-> hashtags
+ foreach ($activity->categories as $cat) {
+ if ($cat->term) {
+ $term = common_canonical_tag($cat->term);
+ if ($term) {
+ $options['tags'][] = $term;
+ }
+ }
+ }
+
try {
$saved = Notice::saveNew($oprofile->profile_id,
$content,
@@ -622,6 +602,9 @@ class Ostatus_profile extends Memcached_DataObject
$options);
if ($saved) {
Ostatus_source::saveNew($saved, $this, $method);
+ if (!empty($attachment)) {
+ File_to_post::processNew($attachment->id, $saved->id);
+ }
}
} catch (Exception $e) {
common_log(LOG_ERR, "OStatus save of remote message $sourceUri failed: " . $e->getMessage());
@@ -636,10 +619,9 @@ class Ostatus_profile extends Memcached_DataObject
*/
protected function purify($html)
{
- // @fixme disable caching or set a sane temp dir
- require_once(INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php');
- $purifier = new HTMLPurifier();
- return $purifier->purify($html);
+ require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+ $config = array('safe' => 1);
+ return htmLawed($html, $config);
}
/**
@@ -716,11 +698,18 @@ class Ostatus_profile extends Memcached_DataObject
{
// Get the canonical feed URI and check it
$discover = new FeedDiscovery();
- $feeduri = $discover->discoverFromURL($profile_uri);
+ if ($hints['feedurl']) {
+ $feeduri = $hints['feedurl'];
+ $feeduri = $discover->discoverFromFeedURL($feeduri);
+ } else {
+ $feeduri = $discover->discoverFromURL($profile_uri);
+ $hints['feedurl'] = $feeduri;
+ }
- //$feedsub = FeedSub::ensureFeed($feeduri, $discover->feed);
$huburi = $discover->getAtomLink('hub');
- $salmonuri = $discover->getAtomLink('salmon');
+ $hints['hub'] = $huburi;
+ $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+ $hints['salmon'] = $salmonuri;
if (!$huburi) {
// We can only deal with folks with a PuSH hub
@@ -735,7 +724,7 @@ class Ostatus_profile extends Memcached_DataObject
if (!empty($subject)) {
$subjObject = new ActivityObject($subject);
- return self::ensureActivityObjectProfile($subjObject, $feeduri, $salmonuri, $hints);
+ return self::ensureActivityObjectProfile($subjObject, $hints);
}
// Otherwise, try the feed author
@@ -744,7 +733,7 @@ class Ostatus_profile extends Memcached_DataObject
if (!empty($author)) {
$authorObject = new ActivityObject($author);
- return self::ensureActivityObjectProfile($authorObject, $feeduri, $salmonuri, $hints);
+ return self::ensureActivityObjectProfile($authorObject, $hints);
}
// Sheesh. Not a very nice feed! Let's try fingerpoken in the
@@ -760,7 +749,7 @@ class Ostatus_profile extends Memcached_DataObject
if (!empty($actor)) {
$actorObject = new ActivityObject($actor);
- return self::ensureActivityObjectProfile($actorObject, $feeduri, $salmonuri, $hints);
+ return self::ensureActivityObjectProfile($actorObject, $hints);
}
@@ -768,7 +757,7 @@ class Ostatus_profile extends Memcached_DataObject
if (!empty($author)) {
$authorObject = new ActivityObject($author);
- return self::ensureActivityObjectProfile($authorObject, $feeduri, $salmonuri, $hints);
+ return self::ensureActivityObjectProfile($authorObject, $hints);
}
}
@@ -785,6 +774,11 @@ class Ostatus_profile extends Memcached_DataObject
*/
protected function updateAvatar($url)
{
+ if ($url == $this->avatar) {
+ // We've already got this one.
+ return;
+ }
+
if ($this->isGroup()) {
$self = $this->localGroup();
} else {
@@ -816,12 +810,40 @@ class Ostatus_profile extends Memcached_DataObject
common_timestamp());
rename($temp_filename, Avatar::path($filename));
$self->setOriginal($filename);
+
+ $orig = clone($this);
+ $this->avatar = $url;
+ $this->update($orig);
}
- protected static function getActivityObjectAvatar($object)
+ /**
+ * Pull avatar URL from ActivityObject or profile hints
+ *
+ * @param ActivityObject $object
+ * @param array $hints
+ * @return mixed URL string or false
+ */
+
+ protected static function getActivityObjectAvatar($object, $hints=array())
{
- // XXX: go poke around in the feed
- return $object->avatar;
+ if ($object->avatarLinks) {
+ $best = false;
+ // Take the exact-size avatar, or the largest avatar, or the first avatar if all sizeless
+ foreach ($object->avatarLinks as $avatar) {
+ if ($avatar->width == AVATAR_PROFILE_SIZE && $avatar->height = AVATAR_PROFILE_SIZE) {
+ // Exact match!
+ $best = $avatar;
+ break;
+ }
+ if (!$best || $avatar->width > $best->width) {
+ $best = $avatar;
+ }
+ }
+ return $best->url;
+ } else if (array_key_exists('avatar', $hints)) {
+ return $hints['avatar'];
+ }
+ return false;
}
/**
@@ -880,16 +902,18 @@ class Ostatus_profile extends Memcached_DataObject
* @return Ostatus_profile
*/
- public static function ensureActorProfile($activity, $feeduri=null, $salmonuri=null)
+ public static function ensureActorProfile($activity, $hints=array())
{
- return self::ensureActivityObjectProfile($activity->actor, $feeduri, $salmonuri);
+ return self::ensureActivityObjectProfile($activity->actor, $hints);
}
- public static function ensureActivityObjectProfile($object, $feeduri=null, $salmonuri=null, $hints=array())
+ public static function ensureActivityObjectProfile($object, $hints=array())
{
$profile = self::getActivityObjectProfile($object);
- if (!$profile) {
- $profile = self::createActivityObjectProfile($object, $feeduri, $salmonuri, $hints);
+ if ($profile) {
+ $profile->updateFromActivityObject($object, $hints);
+ } else {
+ $profile = self::createActivityObjectProfile($object, $hints);
}
return $profile;
}
@@ -898,7 +922,7 @@ class Ostatus_profile extends Memcached_DataObject
* @param Activity $activity
* @return mixed matching Ostatus_profile or false if none known
*/
- protected static function getActorProfile($activity)
+ public static function getActorProfile($activity)
{
return self::getActivityObjectProfile($activity->actor);
}
@@ -935,60 +959,55 @@ class Ostatus_profile extends Memcached_DataObject
* @fixme validate stuff somewhere
*/
- protected static function createActorProfile($activity, $feeduri=null, $salmonuri=null)
- {
- $actor = $activity->actor;
-
- self::createActivityObjectProfile($actor, $feeduri, $salmonuri);
- }
-
/**
* Create local ostatus_profile and profile/user_group entries for
* the provided remote user or group.
*
* @param ActivityObject $object
- * @param string $feeduri
- * @param string $salmonuri
* @param array $hints
*
- * @fixme fold $feeduri/$salmonuri into $hints
* @return Ostatus_profile
*/
- protected static function createActivityObjectProfile($object, $feeduri=null, $salmonuri=null, $hints=array())
+ protected static function createActivityObjectProfile($object, $hints=array())
{
- $homeuri = $object->id;
- $nickname = self::getActivityObjectNickname($object, $hints);
- $avatar = self::getActivityObjectAvatar($object);
+ $homeuri = $object->id;
+ $discover = false;
if (!$homeuri) {
common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true));
throw new ServerException("No profile URI");
}
- if (empty($feeduri)) {
- if (array_key_exists('feedurl', $hints)) {
- $feeduri = $hints['feedurl'];
- }
+ if (array_key_exists('feedurl', $hints)) {
+ $feeduri = $hints['feedurl'];
+ } else {
+ $discover = new FeedDiscovery();
+ $feeduri = $discover->discoverFromURL($homeuri);
}
- if (empty($salmonuri)) {
- if (array_key_exists('salmon', $hints)) {
- $salmonuri = $hints['salmon'];
+ if (array_key_exists('salmon', $hints)) {
+ $salmonuri = $hints['salmon'];
+ } else {
+ if (!$discover) {
+ $discover = new FeedDiscovery();
+ $discover->discoverFromFeedURL($hints['feedurl']);
}
+ $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
}
- if (!$feeduri || !$salmonuri) {
- // Get the canonical feed URI and check it
- $discover = new FeedDiscovery();
- $feeduri = $discover->discoverFromURL($homeuri);
-
+ if (array_key_exists('hub', $hints)) {
+ $huburi = $hints['hub'];
+ } else {
+ if (!$discover) {
+ $discover = new FeedDiscovery();
+ $discover->discoverFromFeedURL($hints['feedurl']);
+ }
$huburi = $discover->getAtomLink('hub');
- $salmonuri = $discover->getAtomLink('salmon');
+ }
- if (!$huburi) {
- // We can only deal with folks with a PuSH hub
- throw new FeedSubNoHubException();
- }
+ if (!$huburi) {
+ // We can only deal with folks with a PuSH hub
+ throw new FeedSubNoHubException();
}
$oprofile = new Ostatus_profile();
@@ -1002,43 +1021,20 @@ class Ostatus_profile extends Memcached_DataObject
if ($object->type == ActivityObject::PERSON) {
$profile = new Profile();
- $profile->nickname = $nickname;
- $profile->fullname = $object->title;
- if (!empty($object->link)) {
- $profile->profileurl = $object->link;
- } else if (array_key_exists('profileurl', $hints)) {
- $profile->profileurl = $hints['profileurl'];
- }
- $profile->created = common_sql_now();
-
- // @fixme bio
- // @fixme tags/categories
- // @fixme location?
- // @todo tags from categories
- // @todo lat/lon/location?
-
+ $profile->created = common_sql_now();
+ self::updateProfile($profile, $object, $hints);
+
$oprofile->profile_id = $profile->insert();
-
if (!$oprofile->profile_id) {
throw new ServerException("Can't save local profile");
}
} else {
$group = new User_group();
- $group->nickname = $nickname;
- $group->fullname = $object->title;
- // @fixme no canonical profileurl; using homepage instead for now
- $group->homepage = $homeuri;
+ $group->uri = $homeuri;
$group->created = common_sql_now();
-
- // @fixme homepage
- // @fixme bio
- // @fixme tags/categories
- // @fixme location?
- // @todo tags from categories
- // @todo lat/lon/location?
+ self::updateGroup($group, $object, $hints);
$oprofile->group_id = $group->insert();
-
if (!$oprofile->group_id) {
throw new ServerException("Can't save local profile");
}
@@ -1047,6 +1043,7 @@ class Ostatus_profile extends Memcached_DataObject
$ok = $oprofile->insert();
if ($ok) {
+ $avatar = self::getActivityObjectAvatar($object, $hints);
if ($avatar) {
$oprofile->updateAvatar($avatar);
}
@@ -1056,12 +1053,170 @@ class Ostatus_profile extends Memcached_DataObject
}
}
+ /**
+ * Save any updated profile information to our local copy.
+ * @param ActivityObject $object
+ * @param array $hints
+ */
+ public function updateFromActivityObject($object, $hints=array())
+ {
+ if ($this->isGroup()) {
+ $group = $this->localGroup();
+ self::updateGroup($group, $object, $hints);
+ } else {
+ $profile = $this->localProfile();
+ self::updateProfile($profile, $object, $hints);
+ }
+ $avatar = self::getActivityObjectAvatar($object, $hints);
+ if ($avatar) {
+ $this->updateAvatar($avatar);
+ }
+ }
+
+ protected static function updateProfile($profile, $object, $hints=array())
+ {
+ $orig = clone($profile);
+
+ $profile->nickname = self::getActivityObjectNickname($object, $hints);
+
+ if (!empty($object->title)) {
+ $profile->fullname = $object->title;
+ } else if (array_key_exists('fullname', $hints)) {
+ $profile->fullname = $hints['fullname'];
+ }
+
+ if (!empty($object->link)) {
+ $profile->profileurl = $object->link;
+ } else if (array_key_exists('profileurl', $hints)) {
+ $profile->profileurl = $hints['profileurl'];
+ } else if (Validate::uri($object->id, array('allowed_schemes' => array('http', 'https')))) {
+ $profile->profileurl = $object->id;
+ }
+
+ $profile->bio = self::getActivityObjectBio($object, $hints);
+ $profile->location = self::getActivityObjectLocation($object, $hints);
+ $profile->homepage = self::getActivityObjectHomepage($object, $hints);
+
+ if (!empty($object->geopoint)) {
+ $location = ActivityContext::locationFromPoint($object->geopoint);
+ if (!empty($location)) {
+ $profile->lat = $location->lat;
+ $profile->lon = $location->lon;
+ }
+ }
+
+ // @fixme tags/categories
+ // @todo tags from categories
+
+ if ($profile->id) {
+ common_log(LOG_DEBUG, "Updating OStatus profile $profile->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true));
+ $profile->update($orig);
+ }
+ }
+
+ protected static function updateGroup($group, $object, $hints=array())
+ {
+ $orig = clone($group);
+
+ $group->nickname = self::getActivityObjectNickname($object, $hints);
+ $group->fullname = $object->title;
+
+ if (!empty($object->link)) {
+ $group->mainpage = $object->link;
+ } else if (array_key_exists('profileurl', $hints)) {
+ $group->mainpage = $hints['profileurl'];
+ }
+
+ // @todo tags from categories
+ $group->description = self::getActivityObjectBio($object, $hints);
+ $group->location = self::getActivityObjectLocation($object, $hints);
+ $group->homepage = self::getActivityObjectHomepage($object, $hints);
+
+ if ($group->id) {
+ common_log(LOG_DEBUG, "Updating OStatus group $group->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true));
+ $group->update($orig);
+ }
+ }
+
+ protected static function getActivityObjectHomepage($object, $hints=array())
+ {
+ $homepage = null;
+ $poco = $object->poco;
+
+ if (!empty($poco)) {
+ $url = $poco->getPrimaryURL();
+ if ($url->type == 'homepage') {
+ $homepage = $url->value;
+ }
+ }
+
+ // @todo Try for a another PoCo URL?
+
+ return $homepage;
+ }
+
+ protected static function getActivityObjectLocation($object, $hints=array())
+ {
+ $location = null;
+
+ if (!empty($object->poco) &&
+ isset($object->poco->address->formatted)) {
+ $location = $object->poco->address->formatted;
+ } else if (array_key_exists('location', $hints)) {
+ $location = $hints['location'];
+ }
+
+ if (!empty($location)) {
+ if (mb_strlen($location) > 255) {
+ $location = mb_substr($note, 0, 255 - 3) . ' … ';
+ }
+ }
+
+ // @todo Try to find location some othe way? Via goerss point?
+
+ return $location;
+ }
+
+ protected static function getActivityObjectBio($object, $hints=array())
+ {
+ $bio = null;
+
+ if (!empty($object->poco)) {
+ $note = $object->poco->note;
+ } else if (array_key_exists('bio', $hints)) {
+ $note = $hints['bio'];
+ }
+
+ if (!empty($note)) {
+ if (Profile::bioTooLong($note)) {
+ // XXX: truncate ok?
+ $bio = mb_substr($note, 0, Profile::maxBio() - 3) . ' … ';
+ } else {
+ $bio = $note;
+ }
+ }
+
+ // @todo Try to get bio info some other way?
+
+ return $bio;
+ }
+
protected static function getActivityObjectNickname($object, $hints=array())
{
+ if ($object->poco) {
+ if (!empty($object->poco->preferredUsername)) {
+ return common_nicknamize($object->poco->preferredUsername);
+ }
+ }
+
if (!empty($object->nickname)) {
return common_nicknamize($object->nickname);
}
+ if (array_key_exists('nickname', $hints)) {
+ return $hints['nickname'];
+ }
+
// Try the definitive ID
$nickname = self::nicknameFromURI($object->id);
@@ -1106,35 +1261,54 @@ class Ostatus_profile extends Memcached_DataObject
public static function ensureWebfinger($addr)
{
+ // First, try the cache
+
+ $uri = self::cacheGet(sprintf('ostatus_profile:webfinger:%s', $addr));
+
+ if ($uri !== false) {
+ if (is_null($uri)) {
+ return null;
+ }
+ $oprofile = Ostatus_profile::staticGet('uri', $uri);
+ if (!empty($oprofile)) {
+ return $oprofile;
+ }
+ }
+
// First, look it up
$oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$addr);
if (!empty($oprofile)) {
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile;
}
// Now, try some discovery
- $wf = new Webfinger();
-
- $result = $wf->lookup($addr);
+ $disco = new Discovery();
- if (!$result) {
+ try {
+ $result = $disco->lookup($addr);
+ } catch (Exception $e) {
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
return null;
}
foreach ($result->links as $link) {
switch ($link['rel']) {
- case Webfinger::PROFILEPAGE:
+ case Discovery::PROFILEPAGE:
$profileUrl = $link['href'];
break;
- case 'salmon':
+ case Salmon::NS_REPLIES:
$salmonEndpoint = $link['href'];
break;
- case Webfinger::UPDATESFROM:
+ case Discovery::UPDATESFROM:
$feedUrl = $link['href'];
break;
+ case Discovery::HCARD:
+ $hcardUrl = $link['href'];
+ break;
default:
common_log(LOG_NOTICE, "Don't know what to do with rel = '{$link['rel']}'");
break;
@@ -1146,11 +1320,19 @@ class Ostatus_profile extends Memcached_DataObject
'feedurl' => $feedUrl,
'salmon' => $salmonEndpoint);
+ if (isset($hcardUrl)) {
+ $hcardHints = self::slurpHcard($hcardUrl);
+ // Note: Webfinger > hcard
+ $hints = array_merge($hcardHints, $hints);
+ }
+
// If we got a feed URL, try that
if (isset($feedUrl)) {
try {
+ common_log(LOG_INFO, "Discovery on acct:$addr with feed URL $feedUrl");
$oprofile = self::ensureProfile($feedUrl, $hints);
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile;
} catch (Exception $e) {
common_log(LOG_WARNING, "Failed creating profile from feed URL '$feedUrl': " . $e->getMessage());
@@ -1162,7 +1344,9 @@ class Ostatus_profile extends Memcached_DataObject
if (isset($profileUrl)) {
try {
+ common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
$oprofile = self::ensureProfile($profileUrl, $hints);
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile;
} catch (Exception $e) {
common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage());
@@ -1214,9 +1398,106 @@ class Ostatus_profile extends Memcached_DataObject
throw new Exception("Couldn't save ostatus_profile for '$addr'");
}
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile;
}
return null;
}
+
+ function saveHTMLFile($title, $rendered)
+ {
+ $final = sprintf("<!DOCTYPE html>\n<html><head><title>%s</title></head>".
+ '<body><div>%s</div></body></html>',
+ htmlspecialchars($title),
+ $rendered);
+
+ $filename = File::filename($this->localProfile(),
+ 'ostatus', // ignored?
+ 'text/html');
+
+ $filepath = File::path($filename);
+
+ file_put_contents($filepath, $final);
+
+ $file = new File;
+
+ $file->filename = $filename;
+ $file->url = File::url($filename);
+ $file->size = filesize($filepath);
+ $file->date = time();
+ $file->mimetype = 'text/html';
+
+ $file_id = $file->insert();
+
+ if ($file_id === false) {
+ common_log_db_error($file, "INSERT", __FILE__);
+ throw new ServerException(_('Could not store HTML content of long post as file.'));
+ }
+
+ return $file;
+ }
+
+ protected static function slurpHcard($url)
+ {
+ set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/plugins/OStatus/extlib/hkit/');
+ require_once('hkit.class.php');
+
+ $h = new hKit;
+
+ // Google Buzz hcards need to be tidied. Probably others too.
+
+ $h->tidy_mode = 'proxy'; // 'proxy', 'exec', 'php' or 'none'
+
+ // Get by URL
+ $hcards = $h->getByURL('hcard', $url);
+
+ if (empty($hcards)) {
+ return array();
+ }
+
+ // @fixme more intelligent guess on multi-hcard pages
+ $hcard = $hcards[0];
+
+ $hints = array();
+
+ $hints['profileurl'] = $url;
+
+ if (array_key_exists('nickname', $hcard)) {
+ $hints['nickname'] = $hcard['nickname'];
+ }
+
+ if (array_key_exists('fn', $hcard)) {
+ $hints['fullname'] = $hcard['fn'];
+ } else if (array_key_exists('n', $hcard)) {
+ $hints['fullname'] = implode(' ', $hcard['n']);
+ }
+
+ if (array_key_exists('photo', $hcard)) {
+ $hints['avatar'] = $hcard['photo'];
+ }
+
+ if (array_key_exists('note', $hcard)) {
+ $hints['bio'] = $hcard['note'];
+ }
+
+ if (array_key_exists('adr', $hcard)) {
+ if (is_string($hcard['adr'])) {
+ $hints['location'] = $hcard['adr'];
+ } else if (is_array($hcard['adr'])) {
+ $hints['location'] = implode(' ', $hcard['adr']);
+ }
+ }
+
+ if (array_key_exists('url', $hcard)) {
+ if (is_string($hcard['url'])) {
+ $hints['homepage'] = $hcard['url'];
+ } else if (is_array($hcard['adr'])) {
+ // HACK get the last one; that's how our hcards look
+ $hints['homepage'] = $hcard['url'][count($hcard['url'])-1];
+ }
+ }
+
+ return $hints;
+ }
}
diff --git a/plugins/OStatus/extlib/hkit/hcard.profile.php b/plugins/OStatus/extlib/hkit/hcard.profile.php
new file mode 100644
index 000000000..6ec0dc890
--- /dev/null
+++ b/plugins/OStatus/extlib/hkit/hcard.profile.php
@@ -0,0 +1,105 @@
+<?php
+ // hcard profile for hkit
+
+ $this->root_class = 'vcard';
+
+ $this->classes = array(
+ 'fn', array('honorific-prefix', 'given-name', 'additional-name', 'family-name', 'honorific-suffix'),
+ 'n', array('honorific-prefix', 'given-name', 'additional-name', 'family-name', 'honorific-suffix'),
+ 'adr', array('post-office-box', 'extended-address', 'street-address', 'postal-code', 'country-name', 'type', 'region', 'locality'),
+ 'label', 'bday', 'agent', 'nickname', 'photo', 'class',
+ 'email', array('type', 'value'),
+ 'category', 'key', 'logo', 'mailer', 'note',
+ 'org', array('organization-name', 'organization-unit'),
+ 'tel', array('type', 'value'),
+ 'geo', array('latitude', 'longitude'),
+ 'tz', 'uid', 'url', 'rev', 'role', 'sort-string', 'sound', 'title'
+ );
+
+ // classes that must only appear once per card
+ $this->singles = array(
+ 'fn'
+ );
+
+ // classes that are required (not strictly enforced - give at least one!)
+ $this->required = array(
+ 'fn'
+ );
+
+ $this->att_map = array(
+ 'fn' => array('IMG|alt'),
+ 'url' => array('A|href', 'IMG|src', 'AREA|href'),
+ 'photo' => array('IMG|src'),
+ 'bday' => array('ABBR|title'),
+ 'logo' => array('IMG|src'),
+ 'email' => array('A|href'),
+ 'geo' => array('ABBR|title')
+ );
+
+
+ $this->callbacks = array(
+ 'url' => array($this, 'resolvePath'),
+ 'photo' => array($this, 'resolvePath'),
+ 'logo' => array($this, 'resolvePath'),
+ 'email' => array($this, 'resolveEmail')
+ );
+
+
+
+ function hKit_hcard_post($a)
+ {
+
+ foreach ($a as &$vcard){
+
+ hKit_implied_n_optimization($vcard);
+ hKit_implied_n_from_fn($vcard);
+
+ }
+
+ return $a;
+
+ }
+
+
+ function hKit_implied_n_optimization(&$vcard)
+ {
+ if (array_key_exists('fn', $vcard) && !is_array($vcard['fn']) &&
+ !array_key_exists('n', $vcard) && (!array_key_exists('org', $vcard) || $vcard['fn'] != $vcard['org'])){
+
+ if (sizeof(explode(' ', $vcard['fn'])) == 2){
+ $patterns = array();
+ $patterns[] = array('/^(\S+),\s*(\S{1})$/', 2, 1); // Lastname, Initial
+ $patterns[] = array('/^(\S+)\s*(\S{1})\.*$/', 2, 1); // Lastname Initial(.)
+ $patterns[] = array('/^(\S+),\s*(\S+)$/', 2, 1); // Lastname, Firstname
+ $patterns[] = array('/^(\S+)\s*(\S+)$/', 1, 2); // Firstname Lastname
+
+ foreach ($patterns as $pattern){
+ if (preg_match($pattern[0], $vcard['fn'], $matches) === 1){
+ $n = array();
+ $n['given-name'] = $matches[$pattern[1]];
+ $n['family-name'] = $matches[$pattern[2]];
+ $vcard['n'] = $n;
+
+
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+ function hKit_implied_n_from_fn(&$vcard)
+ {
+ if (array_key_exists('fn', $vcard) && is_array($vcard['fn'])
+ && !array_key_exists('n', $vcard) && (!array_key_exists('org', $vcard) || $vcard['fn'] != $vcard['org'])){
+
+ $vcard['n'] = $vcard['fn'];
+ }
+
+ if (array_key_exists('fn', $vcard) && is_array($vcard['fn'])){
+ $vcard['fn'] = $vcard['fn']['text'];
+ }
+ }
+
+?> \ No newline at end of file
diff --git a/plugins/OStatus/extlib/hkit/hkit.class.php b/plugins/OStatus/extlib/hkit/hkit.class.php
new file mode 100644
index 000000000..c3a54cff6
--- /dev/null
+++ b/plugins/OStatus/extlib/hkit/hkit.class.php
@@ -0,0 +1,475 @@
+<?php
+
+ /*
+
+ hKit Library for PHP5 - a generic library for parsing Microformats
+ Copyright (C) 2006 Drew McLellan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Author
+ Drew McLellan - http://allinthehead.com/
+
+ Contributors:
+ Scott Reynen - http://www.randomchaos.com/
+
+ Version 0.5, 22-Jul-2006
+ fixed by-ref issue cropping up in PHP 5.0.5
+ fixed a bug with a@title
+ added support for new fn=n optimisation
+ added support for new a.include include-pattern
+ Version 0.4, 23-Jun-2006
+ prevented nested includes from causing infinite loops
+ returns false if URL can't be fetched
+ added pre-flight check for base support level
+ added deduping of once-only classnames
+ prevented accumulation of multiple 'value' values
+ tuned whitespace handling and treatment of DEL elements
+ Version 0.3, 21-Jun-2006
+ added post-processor callback method into profiles
+ fixed minor problems raised by hcard testsuite
+ added support for include-pattern
+ added support for td@headers pattern
+ added implied-n optimization into default hcard profile
+ Version 0.2, 20-Jun-2006
+ added class callback mechanism
+ added resolvePath & resolveEmail
+ added basic BASE support
+ Version 0.1.1, 19-Jun-2006 (different timezone, no time machine)
+ added external Tidy option
+ Version 0.1, 20-Jun-2006
+ initial release
+
+
+
+
+ */
+
+ class hKit
+ {
+
+ public $tidy_mode = 'proxy'; // 'proxy', 'exec', 'php' or 'none'
+ public $tidy_proxy = 'http://cgi.w3.org/cgi-bin/tidy?forceXML=on&docAddr='; // required only for tidy_mode=proxy
+ public $tmp_dir = '/path/to/writable/dir/'; // required only for tidy_mode=exec
+
+ private $root_class = '';
+ private $classes = '';
+ private $singles = '';
+ private $required = '';
+ private $att_map = '';
+ private $callbacks = '';
+ private $processor = '';
+
+ private $url = '';
+ private $base = '';
+ private $doc = '';
+
+
+ public function hKit()
+ {
+ // pre-flight checks
+ $pass = true;
+ $required = array('dom_import_simplexml', 'file_get_contents', 'simplexml_load_string');
+ $missing = array();
+
+ foreach ($required as $f){
+ if (!function_exists($f)){
+ $pass = false;
+ $missing[] = $f . '()';
+ }
+ }
+
+ if (!$pass)
+ die('hKit error: these required functions are not available: <strong>' . implode(', ', $missing) . '</strong>');
+
+ }
+
+
+ public function getByURL($profile='', $url='')
+ {
+
+ if ($profile=='' || $url == '') return false;
+
+ $this->loadProfile($profile);
+
+ $source = $this->loadURL($url);
+
+ if ($source){
+ $tidy_xhtml = $this->tidyThis($source);
+
+ $fragment = false;
+
+ if (strrchr($url, '#'))
+ $fragment = array_pop(explode('#', $url));
+
+ $doc = $this->loadDoc($tidy_xhtml, $fragment);
+ $s = $this->processNodes($doc, $this->classes);
+ $s = $this->postProcess($profile, $s);
+
+ return $s;
+ }else{
+ return false;
+ }
+ }
+
+ public function getByString($profile='', $input_xml='')
+ {
+ if ($profile=='' || $input_xml == '') return false;
+
+ $this->loadProfile($profile);
+
+ $doc = $this->loadDoc($input_xml);
+ $s = $this->processNodes($doc, $this->classes);
+ $s = $this->postProcess($profile, $s);
+
+ return $s;
+
+ }
+
+ private function processNodes($items, $classes, $allow_includes=true){
+
+ $out = array();
+
+ foreach($items as $item){
+ $data = array();
+
+ for ($i=0; $i<sizeof($classes); $i++){
+
+ if (!is_array($classes[$i])){
+
+ $xpath = ".//*[contains(concat(' ',normalize-space(@class),' '),' " . $classes[$i] . " ')]";
+ $results = $item->xpath($xpath);
+
+ if ($results){
+ foreach ($results as $result){
+ if (isset($classes[$i+1]) && is_array($classes[$i+1])){
+ $nodes = $this->processNodes($results, $classes[$i+1]);
+ if (sizeof($nodes) > 0){
+ $nodes = array_merge(array('text'=>$this->getNodeValue($result, $classes[$i])), $nodes);
+ $data[$classes[$i]] = $nodes;
+ }else{
+ $data[$classes[$i]] = $this->getNodeValue($result, $classes[$i]);
+ }
+
+ }else{
+ if (isset($data[$classes[$i]])){
+ if (is_array($data[$classes[$i]])){
+ // is already an array - append
+ $data[$classes[$i]][] = $this->getNodeValue($result, $classes[$i]);
+
+ }else{
+ // make it an array
+ if ($classes[$i] == 'value'){ // unless it's the 'value' of a type/value pattern
+ $data[$classes[$i]] .= $this->getNodeValue($result, $classes[$i]);
+ }else{
+ $old_val = $data[$classes[$i]];
+ $data[$classes[$i]] = array($old_val, $this->getNodeValue($result, $classes[$i]));
+ $old_val = false;
+ }
+ }
+ }else{
+ // set as normal value
+ $data[$classes[$i]] = $this->getNodeValue($result, $classes[$i]);
+
+ }
+ }
+
+ // td@headers pattern
+ if (strtoupper(dom_import_simplexml($result)->tagName)== "TD" && $result['headers']){
+ $include_ids = explode(' ', $result['headers']);
+ $doc = $this->doc;
+ foreach ($include_ids as $id){
+ $xpath = "//*[@id='$id']/..";
+ $includes = $doc->xpath($xpath);
+ foreach ($includes as $include){
+ $tmp = $this->processNodes($include, $this->classes);
+ if (is_array($tmp)) $data = array_merge($data, $tmp);
+ }
+ }
+ }
+ }
+ }
+ }
+ $result = false;
+ }
+
+ // include-pattern
+ if ($allow_includes){
+ $xpath = ".//*[contains(concat(' ',normalize-space(@class),' '),' include ')]";
+ $results = $item->xpath($xpath);
+
+ if ($results){
+ foreach ($results as $result){
+ $tagName = strtoupper(dom_import_simplexml($result)->tagName);
+ if ((($tagName == "OBJECT" && $result['data']) || ($tagName == "A" && $result['href']))
+ && preg_match('/\binclude\b/', $result['class'])){
+ $att = ($tagName == "OBJECT" ? 'data' : 'href');
+ $id = str_replace('#', '', $result[$att]);
+ $doc = $this->doc;
+ $xpath = "//*[@id='$id']";
+ $includes = $doc->xpath($xpath);
+ foreach ($includes as $include){
+ $include = simplexml_load_string('<root1><root2>'.$include->asXML().'</root2></root1>'); // don't ask.
+ $tmp = $this->processNodes($include, $this->classes, false);
+ if (is_array($tmp)) $data = array_merge($data, $tmp);
+ }
+ }
+ }
+ }
+ }
+ $out[] = $data;
+ }
+
+ if (sizeof($out) > 1){
+ return $out;
+ }else if (isset($data)){
+ return $data;
+ }else{
+ return array();
+ }
+ }
+
+
+ private function getNodeValue($node, $className)
+ {
+
+ $tag_name = strtoupper(dom_import_simplexml($node)->tagName);
+ $s = false;
+
+ // ignore DEL tags
+ if ($tag_name == 'DEL') return $s;
+
+ // look up att map values
+ if (array_key_exists($className, $this->att_map)){
+
+ foreach ($this->att_map[$className] as $map){
+ if (preg_match("/$tag_name\|/", $map)){
+ $s = ''.$node[array_pop($foo = explode('|', $map))];
+ }
+ }
+ }
+
+ // if nothing and OBJ, try data.
+ if (!$s && $tag_name=='OBJECT' && $node['data']) $s = ''.$node['data'];
+
+ // if nothing and IMG, try alt.
+ if (!$s && $tag_name=='IMG' && $node['alt']) $s = ''.$node['alt'];
+
+ // if nothing and AREA, try alt.
+ if (!$s && $tag_name=='AREA' && $node['alt']) $s = ''.$node['alt'];
+
+ //if nothing and not A, try title.
+ if (!$s && $tag_name!='A' && $node['title']) $s = ''.$node['title'];
+
+
+ // if nothing found, go with node text
+ $s = ($s ? $s : implode(array_filter($node->xpath('child::node()'), array(&$this, "filterBlankValues")), ' '));
+
+ // callbacks
+ if (array_key_exists($className, $this->callbacks)){
+ $s = preg_replace_callback('/.*/', $this->callbacks[$className], $s, 1);
+ }
+
+ // trim and remove line breaks
+ if ($tag_name != 'PRE'){
+ $s = trim(preg_replace('/[\r\n\t]+/', '', $s));
+ $s = trim(preg_replace('/(\s{2})+/', ' ', $s));
+ }
+
+ return $s;
+ }
+
+ private function filterBlankValues($s){
+ return preg_match("/\w+/", $s);
+ }
+
+
+ private function tidyThis($source)
+ {
+ switch ( $this->tidy_mode )
+ {
+ case 'exec':
+ $tmp_file = $this->tmp_dir.md5($source).'.txt';
+ file_put_contents($tmp_file, $source);
+ exec("tidy -utf8 -indent -asxhtml -numeric -bare -quiet $tmp_file", $tidy);
+ unlink($tmp_file);
+ return implode("\n", $tidy);
+ break;
+
+ case 'php':
+ $tidy = tidy_parse_string($source);
+ return tidy_clean_repair($tidy);
+ break;
+
+ default:
+ return $source;
+ break;
+ }
+
+ }
+
+
+ private function loadProfile($profile)
+ {
+ require_once("$profile.profile.php");
+ }
+
+
+ private function loadDoc($input_xml, $fragment=false)
+ {
+ $xml = simplexml_load_string($input_xml);
+
+ $this->doc = $xml;
+
+ if ($fragment){
+ $doc = $xml->xpath("//*[@id='$fragment']");
+ $xml = simplexml_load_string($doc[0]->asXML());
+ $doc = null;
+ }
+
+ // base tag
+ if ($xml->head->base['href']) $this->base = $xml->head->base['href'];
+
+ // xml:base attribute - PITA with SimpleXML
+ preg_match('/xml:base="(.*)"/', $xml->asXML(), $matches);
+ if (is_array($matches) && sizeof($matches)>1) $this->base = $matches[1];
+
+ return $xml->xpath("//*[contains(concat(' ',normalize-space(@class),' '),' $this->root_class ')]");
+
+ }
+
+
+ private function loadURL($url)
+ {
+ $this->url = $url;
+
+ if ($this->tidy_mode == 'proxy' && $this->tidy_proxy != ''){
+ $url = $this->tidy_proxy . $url;
+ }
+
+ return @file_get_contents($url);
+
+ }
+
+
+ private function postProcess($profile, $s)
+ {
+ $required = $this->required;
+
+ if (is_array($s) && array_key_exists($required[0], $s)){
+ $s = array($s);
+ }
+
+ $s = $this->dedupeSingles($s);
+
+ if (function_exists('hKit_'.$profile.'_post')){
+ $s = call_user_func('hKit_'.$profile.'_post', $s);
+ }
+
+ $s = $this->removeTextVals($s);
+
+ return $s;
+ }
+
+
+ private function resolvePath($filepath)
+ { // ugly code ahoy: needs a serious tidy up
+
+ $filepath = $filepath[0];
+
+ $base = $this->base;
+ $url = $this->url;
+
+ if ($base != '' && strpos($base, '://') !== false)
+ $url = $base;
+
+ $r = parse_url($url);
+ $domain = $r['scheme'] . '://' . $r['host'];
+
+ if (!isset($r['path'])) $r['path'] = '/';
+ $path = explode('/', $r['path']);
+ $file = explode('/', $filepath);
+ $new = array('');
+
+ if (strpos($filepath, '://') !== false || strpos($filepath, 'data:') !== false){
+ return $filepath;
+ }
+
+ if ($file[0] == ''){
+ // absolute path
+ return ''.$domain . implode('/', $file);
+ }else{
+ // relative path
+ if ($path[sizeof($path)-1] == '') array_pop($path);
+ if (strpos($path[sizeof($path)-1], '.') !== false) array_pop($path);
+
+ foreach ($file as $segment){
+ if ($segment == '..'){
+ array_pop($path);
+ }else{
+ $new[] = $segment;
+ }
+ }
+ return ''.$domain . implode('/', $path) . implode('/', $new);
+ }
+ }
+
+ private function resolveEmail($v)
+ {
+ $parts = parse_url($v[0]);
+ return ($parts['path']);
+ }
+
+
+ private function dedupeSingles($s)
+ {
+ $singles = $this->singles;
+
+ foreach ($s as &$item){
+ foreach ($singles as $classname){
+ if (array_key_exists($classname, $item) && is_array($item[$classname])){
+ if (isset($item[$classname][0])) $item[$classname] = $item[$classname][0];
+ }
+ }
+ }
+
+ return $s;
+ }
+
+ private function removeTextVals($s)
+ {
+ foreach ($s as $key => &$val){
+ if ($key){
+ $k = $key;
+ }else{
+ $k = '';
+ }
+
+ if (is_array($val)){
+ $val = $this->removeTextVals($val);
+ }else{
+ if ($k == 'text'){
+ $val = '';
+ }
+ }
+ }
+
+ return array_filter($s);
+ }
+
+ }
+
+
+?> \ No newline at end of file
diff --git a/plugins/OStatus/js/ostatus.js b/plugins/OStatus/js/ostatus.js
index 1fc44b21b..bd29b5c0c 100644
--- a/plugins/OStatus/js/ostatus.js
+++ b/plugins/OStatus/js/ostatus.js
@@ -24,35 +24,9 @@
* @note Everything in here should eventually migrate over to /js/util.js's SN.
*/
-SN.C.S.StatusNetInstance = 'StatusNetInstance';
-
-SN.U.StatusNetInstance = {
- Set: function(value) {
- $.cookie(
- SN.C.S.StatusNetInstance,
- JSON.stringify(value),
- {
- path: '/',
- expires: SN.U.GetFullYear(2029, 0, 1)
- });
- },
-
- Get: function() {
- var cookieValue = $.cookie(SN.C.S.StatusNetInstance);
- if (cookieValue !== null) {
- return JSON.parse(cookieValue);
- }
- return null;
- },
-
- Delete: function() {
- $.cookie(SN.C.S.StatusNetInstance, null);
- }
-};
-
SN.Init.OStatusCookie = function() {
if (SN.U.StatusNetInstance.Get() === null) {
- SN.U.StatusNetInstance.Set({profile: null});
+ SN.U.StatusNetInstance.Set({RemoteProfile: null});
}
};
@@ -101,10 +75,10 @@ SN.U.DialogBox = {
if (form.attr('id') == 'form_ostatus_connect') {
SN.Init.OStatusCookie();
- form.find('#profile').val(SN.U.StatusNetInstance.Get().profile);
+ form.find('#profile').val(SN.U.StatusNetInstance.Get().RemoteProfile);
form.find("[type=submit]").bind('click', function() {
- SN.U.StatusNetInstance.Set({profile: form.find('#profile').val()});
+ SN.U.StatusNetInstance.Set({RemoteProfile: form.find('#profile').val()});
return true;
});
}
@@ -123,4 +97,6 @@ SN.Init.Subscribe = function() {
$(document).ready(function() {
SN.Init.Subscribe();
+
+ $('.form_remote_authorize').bind('submit', function() { $(this).addClass(SN.C.S.Processing); return true; });
});
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
new file mode 100644
index 000000000..388df0a28
--- /dev/null
+++ b/plugins/OStatus/lib/discovery.php
@@ -0,0 +1,310 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A sample module to show best practices for StatusNet plugins
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package StatusNet
+ * @author James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link http://status.net/
+ */
+
+/**
+ * This class implements LRDD-based service discovery based on the "Hammer Draft"
+ * (including webfinger)
+ *
+ * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
+ */
+class Discovery
+{
+
+ const LRDD_REL = 'lrdd';
+ const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
+ const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
+ const HCARD = 'http://microformats.org/profile/hcard';
+
+ public $methods = array();
+
+ public function __construct()
+ {
+ $this->registerMethod('Discovery_LRDD_Host_Meta');
+ $this->registerMethod('Discovery_LRDD_Link_Header');
+ $this->registerMethod('Discovery_LRDD_Link_HTML');
+ }
+
+
+ public function registerMethod($class)
+ {
+ $this->methods[] = $class;
+ }
+
+ /**
+ * Given a "user id" make sure it's normalized to either a webfinger
+ * acct: uri or a profile HTTP URL.
+ */
+ public static function normalize($user_id)
+ {
+ if (substr($user_id, 0, 5) == 'http:' ||
+ substr($user_id, 0, 6) == 'https:' ||
+ substr($user_id, 0, 5) == 'acct:') {
+ return $user_id;
+ }
+
+ if (strpos($user_id, '@') !== FALSE) {
+ return 'acct:' . $user_id;
+ }
+
+ return 'http://' . $user_id;
+ }
+
+ public static function isWebfinger($user_id)
+ {
+ $uri = Discovery::normalize($user_id);
+
+ return (substr($uri, 0, 5) == 'acct:');
+ }
+
+ /**
+ * This implements the actual lookup procedure
+ */
+ public function lookup($id)
+ {
+ // Normalize the incoming $id to make sure we have a uri
+ $uri = $this->normalize($id);
+
+ foreach ($this->methods as $class) {
+ $links = call_user_func(array($class, 'discover'), $uri);
+ if ($link = Discovery::getService($links, Discovery::LRDD_REL)) {
+ // Load the LRDD XRD
+ if ($link['template']) {
+ $xrd_uri = Discovery::applyTemplate($link['template'], $uri);
+ } else {
+ $xrd_uri = $link['href'];
+ }
+
+ $xrd = $this->fetchXrd($xrd_uri);
+ if ($xrd) {
+ return $xrd;
+ }
+ }
+ }
+
+ throw new Exception('Unable to find services for '. $id);
+ }
+
+ public static function getService($links, $service) {
+ if (!is_array($links)) {
+ return false;
+ }
+
+ foreach ($links as $link) {
+ if ($link['rel'] == $service) {
+ return $link;
+ }
+ }
+ }
+
+
+ public static function applyTemplate($template, $id)
+ {
+ $template = str_replace('{uri}', urlencode($id), $template);
+
+ return $template;
+ }
+
+
+ public static function fetchXrd($url)
+ {
+ try {
+ $client = new HTTPClient();
+ $response = $client->get($url);
+ } catch (HTTP_Request2_Exception $e) {
+ return false;
+ }
+
+ if ($response->getStatus() != 200) {
+ return false;
+ }
+
+ return XRD::parse($response->getBody());
+ }
+}
+
+interface Discovery_LRDD
+{
+ public function discover($uri);
+}
+
+class Discovery_LRDD_Host_Meta implements Discovery_LRDD
+{
+ public function discover($uri)
+ {
+ if (!Discovery::isWebfinger($uri)) {
+ return false;
+ }
+
+ // We have a webfinger acct: - start with host-meta
+ list($name, $domain) = explode('@', $uri);
+ $url = 'http://'. $domain .'/.well-known/host-meta';
+
+ $xrd = Discovery::fetchXrd($url);
+
+ if ($xrd) {
+ if ($xrd->host != $domain) {
+ return false;
+ }
+
+ return $xrd->links;
+ }
+ }
+}
+
+class Discovery_LRDD_Link_Header implements Discovery_LRDD
+{
+ public function discover($uri)
+ {
+ try {
+ $client = new HTTPClient();
+ $response = $client->get($uri);
+ } catch (HTTP_Request2_Exception $e) {
+ return false;
+ }
+
+ if ($response->getStatus() != 200) {
+ return false;
+ }
+
+ $link_header = $response->getHeader('Link');
+ if (!$link_header) {
+ // return false;
+ }
+
+ return Discovery_LRDD_Link_Header::parseHeader($link_header);
+ }
+
+ protected static function parseHeader($header)
+ {
+ preg_match('/^<[^>]+>/', $header, $uri_reference);
+ //if (empty($uri_reference)) return;
+
+ $links = array();
+
+ $link_uri = trim($uri_reference[0], '<>');
+ $link_rel = array();
+ $link_type = null;
+
+ // remove uri-reference from header
+ $header = substr($header, strlen($uri_reference[0]));
+
+ // parse link-params
+ $params = explode(';', $header);
+
+ foreach ($params as $param) {
+ if (empty($param)) continue;
+ list($param_name, $param_value) = explode('=', $param, 2);
+ $param_name = trim($param_name);
+ $param_value = preg_replace('(^"|"$)', '', trim($param_value));
+
+ // for now we only care about 'rel' and 'type' link params
+ // TODO do something with the other links-params
+ switch ($param_name) {
+ case 'rel':
+ $link_rel = trim($param_value);
+ break;
+
+ case 'type':
+ $link_type = trim($param_value);
+ }
+ }
+
+ $links[] = array(
+ 'href' => $link_uri,
+ 'rel' => $link_rel,
+ 'type' => $link_type);
+
+ return $links;
+ }
+}
+
+class Discovery_LRDD_Link_HTML implements Discovery_LRDD
+{
+ public function discover($uri)
+ {
+ try {
+ $client = new HTTPClient();
+ $response = $client->get($uri);
+ } catch (HTTP_Request2_Exception $e) {
+ return false;
+ }
+
+ if ($response->getStatus() != 200) {
+ return false;
+ }
+
+ return Discovery_LRDD_Link_HTML::parse($response->getBody());
+ }
+
+
+ public function parse($html)
+ {
+ $links = array();
+
+ preg_match('/<head(\s[^>]*)?>(.*?)<\/head>/is', $html, $head_matches);
+ $head_html = $head_matches[2];
+
+ preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
+
+ foreach ($link_matches[0] as $link_html) {
+ $link_url = null;
+ $link_rel = null;
+ $link_type = null;
+
+ preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);
+ if ( isset($rel_matches[3]) ) {
+ $link_rel = $rel_matches[3];
+ } else if ( isset($rel_matches[1]) ) {
+ $link_rel = $rel_matches[1];
+ }
+
+ preg_match('/\shref=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $href_matches);
+ if ( isset($href_matches[3]) ) {
+ $link_uri = $href_matches[3];
+ } else if ( isset($href_matches[1]) ) {
+ $link_uri = $href_matches[1];
+ }
+
+ preg_match('/\stype=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $type_matches);
+ if ( isset($type_matches[3]) ) {
+ $link_type = $type_matches[3];
+ } else if ( isset($type_matches[1]) ) {
+ $link_type = $type_matches[1];
+ }
+
+ $links[] = array(
+ 'href' => $link_url,
+ 'rel' => $link_rel,
+ 'type' => $link_type,
+ );
+ }
+
+ return $links;
+ }
+}
diff --git a/plugins/OStatus/lib/hubverifyqueuehandler.php b/plugins/OStatus/lib/hubconfqueuehandler.php
index 7ce9e1431..c8e0b72fe 100644
--- a/plugins/OStatus/lib/hubverifyqueuehandler.php
+++ b/plugins/OStatus/lib/hubconfqueuehandler.php
@@ -22,11 +22,11 @@
* @package Hub
* @author Brion Vibber <brion@status.net>
*/
-class HubVerifyQueueHandler extends QueueHandler
+class HubConfQueueHandler extends QueueHandler
{
function transport()
{
- return 'hubverify';
+ return 'hubconf';
}
function handle($data)
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 81f4609c5..230d81ba1 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -50,19 +50,26 @@ class MagicEnvelope
public function getKeyPair($signer_uri)
{
- return 'RSA.79_L2gq-TD72Nsb5yGS0r9stLLpJZF5AHXyxzWmQmlqKl276LEJEs8CppcerLcR90MbYQUwt-SX9slx40Yq3vA==.AQAB.AR-jo5KMfSISmDAT2iMs2_vNFgWRjl5rbJVvA0SpGIEWyPdCGxlPtCbTexp8-0ZEIe8a4SyjatBECH5hxgMTpw==';
- }
-
-
- public function signMessage($text, $mimetype, $signer_uri)
- {
- $signer_uri = $this->normalizeUser($signer_uri);
+ $disco = new Discovery();
- if (!$this->checkAuthor($text, $signer_uri)) {
+ try {
+ $xrd = $disco->lookup($signer_uri);
+ } catch (Exception $e) {
return false;
}
+ if ($xrd->links) {
+ if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
+ list($type, $keypair) = explode(';', $link['href']);
+ return $keypair;
+ }
+ }
+ throw new Exception('Unable to locate signer public key');
+ }
+
- $signature_alg = Magicsig::fromString($this->getKeyPair($signer_uri));
+ public function signMessage($text, $mimetype, $keypair)
+ {
+ $signature_alg = Magicsig::fromString($keypair);
$armored_text = base64_encode($text);
return array(
@@ -76,6 +83,28 @@ class MagicEnvelope
}
+ public function toXML($env) {
+ $dom = new DOMDocument();
+
+ $envelope = $dom->createElementNS(MagicEnvelope::NS, 'me:env');
+ $envelope->setAttribute('xmlns:me', MagicEnvelope::NS);
+ $data = $dom->createElementNS(MagicEnvelope::NS, 'me:data', $env['data']);
+ $data->setAttribute('type', $env['data_type']);
+ $envelope->appendChild($data);
+ $enc = $dom->createElementNS(MagicEnvelope::NS, 'me:encoding', $env['encoding']);
+ $envelope->appendChild($enc);
+ $alg = $dom->createElementNS(MagicEnvelope::NS, 'me:alg', $env['alg']);
+ $envelope->appendChild($alg);
+ $sig = $dom->createElementNS(MagicEnvelope::NS, 'me:sig', $env['sig']);
+ $envelope->appendChild($sig);
+
+ $dom->appendChild($envelope);
+
+
+ return $dom->saveXML();
+ }
+
+
public function unfold($env)
{
$dom = new DOMDocument();
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index c1e50bffa..6ca31c485 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -83,23 +83,11 @@ class OStatusQueueHandler extends QueueHandler
function pingReply($oprofile)
{
if ($this->user) {
- if (!empty($oprofile->salmonuri)) {
- // For local posts, send a Salmon ping to the mentioned
- // remote user or group.
- // @fixme as an optimization we can skip this if the
- // remote profile is subscribed to the author.
-
- common_log(LOG_INFO, "Prepping to send notice '{$this->notice->uri}' to remote profile '{$oprofile->uri}'.");
-
- $xml = '<?xml version="1.0" encoding="UTF-8" ?' . '>';
- $xml .= $this->notice->asAtomEntry(true, true);
-
- $data = array('salmonuri' => $oprofile->salmonuri,
- 'entry' => $xml);
-
- $qm = QueueManager::get();
- $qm->enqueue($data, 'salmonout');
- }
+ // For local posts, send a Salmon ping to the mentioned
+ // remote user or group.
+ // @fixme as an optimization we can skip this if the
+ // remote profile is subscribed to the author.
+ $oprofile->notifyDeferred($this->notice, $this->user);
}
}
diff --git a/plugins/OStatus/lib/pushinputqueuehandler.php b/plugins/OStatus/lib/pushinqueuehandler.php
index cbd9139b5..1fd29ae30 100644
--- a/plugins/OStatus/lib/pushinputqueuehandler.php
+++ b/plugins/OStatus/lib/pushinqueuehandler.php
@@ -23,11 +23,11 @@
* @author Brion Vibber <brion@status.net>
*/
-class PushInputQueueHandler extends QueueHandler
+class PushInQueueHandler extends QueueHandler
{
function transport()
{
- return 'pushinput';
+ return 'pushin';
}
function handle($data)
@@ -40,7 +40,11 @@ class PushInputQueueHandler extends QueueHandler
$feedsub = FeedSub::staticGet('id', $feedsub_id);
if ($feedsub) {
- $feedsub->receive($post, $hmac);
+ try {
+ $feedsub->receive($post, $hmac);
+ } catch(Exception $e) {
+ common_log(LOG_ERR, "Exception during PuSH input processing for $feedsub->uri: " . $e->getMessage());
+ }
} else {
common_log(LOG_ERR, "Discarding POST to unknown feed subscription id $feedsub_id");
}
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index b5f178cc6..3d3341bc6 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -28,6 +28,11 @@
*/
class Salmon
{
+
+ const NS_REPLIES = "http://salmon-protocol.org/ns/salmon-replies";
+
+ const NS_MENTIONS = "http://salmon-protocol.org/ns/salmon-mention";
+
/**
* Sign and post the given Atom entry as a Salmon message.
*
@@ -37,17 +42,20 @@ class Salmon
* @param string $xml
* @return boolean success
*/
- public function post($endpoint_uri, $xml)
+ public function post($endpoint_uri, $xml, $actor)
{
if (empty($endpoint_uri)) {
return false;
}
- if (!common_config('ostatus', 'skip_signatures')) {
- $xml = $this->createMagicEnv($xml);
+ try {
+ $xml = $this->createMagicEnv($xml, $actor);
+ } catch (Exception $e) {
+ common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
+ return false;
}
- $headers = array('Content-Type: application/atom+xml');
+ $headers = array('Content-Type: application/magic-envelope+xml');
try {
$client = new HTTPClient();
@@ -65,24 +73,37 @@ class Salmon
return true;
}
- public function createMagicEnv($text)
+ public function createMagicEnv($text, $actor)
{
$magic_env = new MagicEnvelope();
- // TODO: Should probably be getting the signer uri as an argument?
- $signer_uri = $magic_env->getAuthor($text);
-
- $env = $magic_env->signMessage($text, 'application/atom+xml', $signer_uri);
+ $user = User::staticGet('id', $actor->id);
+ if ($user->id) {
+ // Use local key
+ $magickey = Magicsig::staticGet('user_id', $user->id);
+ if (!$magickey) {
+ // No keypair yet, let's generate one.
+ $magickey = new Magicsig();
+ $magickey->generate($user->id);
+ }
+ } else {
+ throw new Exception("Salmon invalid actor for signing");
+ }
- return $magic_env->unfold($env);
+ try {
+ $env = $magic_env->signMessage($text, 'application/atom+xml', $magickey->toString());
+ } catch (Exception $e) {
+ return $text;
+ }
+ return $magic_env->toXML($env);
}
- public function verifyMagicEnv($dom)
+ public function verifyMagicEnv($text)
{
$magic_env = new MagicEnvelope();
- $env = $magic_env->fromDom($dom);
+ $env = $magic_env->parse($text);
return $magic_env->verify($env);
}
diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 9aac2ed52..9ca350e67 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -38,32 +38,34 @@ class SalmonAction extends Action
parent::prepare($args);
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
- $this->clientError(_('This method requires a POST.'));
+ $this->clientError(_m('This method requires a POST.'));
}
- if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/atom+xml') {
- $this->clientError(_('Salmon requires application/atom+xml'));
+ if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') {
+ $this->clientError(_m('Salmon requires application/magic-envelope+xml'));
}
$xml = file_get_contents('php://input');
- $dom = DOMDocument::loadXML($xml);
+ // Check the signature
+ $salmon = new Salmon;
+ if (!$salmon->verifyMagicEnv($xml)) {
+ common_log(LOG_DEBUG, "Salmon signature verification failed.");
+ $this->clientError(_m('Salmon signature verification failed.'));
+ } else {
+ $env = MagicEnvelope::parse($xml);
+ $xml = MagicEnvelope::unfold($env);
+ }
+
+
+ $dom = DOMDocument::loadXML($xml);
if ($dom->documentElement->namespaceURI != Activity::ATOM ||
$dom->documentElement->localName != 'entry') {
common_log(LOG_DEBUG, "Got invalid Salmon post: $xml");
$this->clientError(_m('Salmon post must be an Atom entry.'));
}
- // Check the signature
- $salmon = new Salmon;
- if (!common_config('ostatus', 'skip_signatures')) {
- if (!$salmon->verifyMagicEnv($dom)) {
- common_log(LOG_DEBUG, "Salmon signature verification failed.");
- $this->clientError(_m('Salmon signature verification failed.'));
- }
- }
-
$this->act = new Activity($dom->documentElement);
return true;
}
@@ -76,8 +78,7 @@ class SalmonAction extends Action
{
StatusNet::setApi(true); // Send smaller error pages
- // TODO : Insert new $xml -> notice code
-
+ common_log(LOG_DEBUG, "Got a " . $this->act->verb);
if (Event::handle('StartHandleSalmon', array($this->activity))) {
switch ($this->act->verb)
{
@@ -106,8 +107,11 @@ class SalmonAction extends Action
case ActivityVerb::LEAVE:
$this->handleLeave();
break;
+ case ActivityVerb::UPDATE_PROFILE:
+ $this->handleUpdateProfile();
+ break;
default:
- throw new ClientException(_("Unimplemented."));
+ throw new ClientException(_m("Unrecognized activity type."));
}
Event::handle('EndHandleSalmon', array($this->activity));
}
@@ -115,56 +119,57 @@ class SalmonAction extends Action
function handlePost()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand posts."));
}
function handleFollow()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand follows."));
}
function handleUnfollow()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand unfollows."));
}
function handleFavorite()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand favorites."));
}
- /**
- * Remote user doesn't like one of our posts after all!
- * Confirm the post is ours, and delete a local favorite event.
- */
-
function handleUnfavorite()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand unfavorites."));
}
- /**
- * Hmmmm
- */
function handleShare()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand share events."));
}
- /**
- * Hmmmm
- */
function handleJoin()
{
- throw new ClientException(_("Unimplemented!"));
+ throw new ClientException(_m("This target doesn't understand joins."));
+ }
+
+ function handleLeave()
+ {
+ throw new ClientException(_m("This target doesn't understand leave events."));
}
/**
- * Hmmmm
+ * Remote user sent us an update to their profile.
+ * If we already know them, accept the updates.
*/
- function handleLeave()
+ function handleUpdateProfile()
{
- throw new ClientException(_("Unimplemented!"));
+ $oprofile = Ostatus_profile::getActorProfile($this->act);
+ if ($oprofile) {
+ common_log(LOG_INFO, "Got a profile-update ping from $oprofile->uri");
+ $oprofile->updateFromActivityObject($this->act->actor);
+ } else {
+ common_log(LOG_INFO, "Ignoring profile-update ping from unknown " . $this->act->actor->id);
+ }
}
/**
diff --git a/plugins/OStatus/lib/salmonoutqueuehandler.php b/plugins/OStatus/lib/salmonqueuehandler.php
index 536ff94af..7eeb5f8e9 100644
--- a/plugins/OStatus/lib/salmonoutqueuehandler.php
+++ b/plugins/OStatus/lib/salmonqueuehandler.php
@@ -22,11 +22,11 @@
* @package OStatusPlugin
* @author Brion Vibber <brion@status.net>
*/
-class SalmonOutQueueHandler extends QueueHandler
+class SalmonQueueHandler extends QueueHandler
{
function transport()
{
- return 'salmonout';
+ return 'salmon';
}
function handle($data)
@@ -35,8 +35,10 @@ class SalmonOutQueueHandler extends QueueHandler
assert(is_string($data['salmonuri']));
assert(is_string($data['entry']));
+ $actor = Profile::staticGet($data['actor']);
+
$salmon = new Salmon();
- $salmon->post($data['salmonuri'], $data['entry']);
+ $salmon->post($data['salmonuri'], $data['entry'], $actor);
// @fixme detect failure and attempt to resend
return true;
diff --git a/plugins/OStatus/lib/webfinger.php b/plugins/OStatus/lib/webfinger.php
deleted file mode 100644
index 8a5037629..000000000
--- a/plugins/OStatus/lib/webfinger.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
- *
- * A sample module to show best practices for StatusNet plugins
- *
- * PHP version 5
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @package StatusNet
- * @author James Walker <james@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link http://status.net/
- */
-
-define('WEBFINGER_SERVICE_REL_VALUE', 'lrdd');
-
-/**
- * Implement the webfinger protocol.
- */
-
-class Webfinger
-{
- const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
- const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-
- /**
- * Perform a webfinger lookup given an account.
- */
-
- public function lookup($id)
- {
- $id = $this->normalize($id);
- list($name, $domain) = explode('@', $id);
-
- $links = $this->getServiceLinks($domain);
- if (!$links) {
- return false;
- }
-
- $services = array();
- foreach ($links as $link) {
- if ($link['template']) {
- return $this->getServiceDescription($link['template'], $id);
- }
- if ($link['href']) {
- return $this->getServiceDescription($link['href'], $id);
- }
- }
- }
-
- /**
- * Normalize an account ID
- */
- function normalize($id)
- {
- if (substr($id, 0, 7) == 'acct://') {
- return substr($id, 7);
- } else if (substr($id, 0, 5) == 'acct:') {
- return substr($id, 5);
- }
-
- return $id;
- }
-
- function getServiceLinks($domain)
- {
- $url = 'http://'. $domain .'/.well-known/host-meta';
- $content = $this->fetchURL($url);
- if (empty($content)) {
- common_log(LOG_DEBUG, 'Error fetching host-meta');
- return false;
- }
- $result = XRD::parse($content);
-
- // Ensure that the host == domain (spec may include signing later)
- if ($result->host != $domain) {
- return false;
- }
-
- $links = array();
- foreach ($result->links as $link) {
- if ($link['rel'] == WEBFINGER_SERVICE_REL_VALUE) {
- $links[] = $link;
- }
-
- }
- return $links;
- }
-
- function getServiceDescription($template, $id)
- {
- $url = $this->applyTemplate($template, 'acct:' . $id);
-
- $content = $this->fetchURL($url);
-
- if (!$content) {
- return false;
- }
-
- return XRD::parse($content);
- }
-
- function fetchURL($url)
- {
- try {
- $client = new HTTPClient();
- $response = $client->get($url);
- } catch (HTTP_Request2_Exception $e) {
- return false;
- }
-
- if ($response->getStatus() != 200) {
- return false;
- }
-
- return $response->getBody();
- }
-
- function applyTemplate($template, $id)
- {
- $template = str_replace('{uri}', urlencode($id), $template);
-
- return $template;
- }
-
- function getHostMeta($domain, $template) {
- $xrd = new XRD();
- $xrd->host = $domain;
- $xrd->links[] = array('rel' => 'lrdd',
- 'template' => $template,
- 'title' => array('Resource Descriptor'));
-
- return $xrd->toXML();
- }
-}
-
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 6c212453e..2b3cb35f1 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -244,8 +244,6 @@ class RealtimePlugin extends Plugin
// of refactoring from within a plugin, so I'm just abusing
// the ApiAction method. Don't do this unless you're me!
- require_once(INSTALLDIR.'/lib/api.php');
-
$act = new ApiAction('/dev/null');
$arr = $act->twitterStatusArray($notice, true);
diff --git a/plugins/Realtime/icon_external.gif b/plugins/Realtime/icon_external.gif
deleted file mode 100644
index c4118d53b..000000000
--- a/plugins/Realtime/icon_external.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/Realtime/icon_pause.gif b/plugins/Realtime/icon_pause.gif
deleted file mode 100644
index ced0b6440..000000000
--- a/plugins/Realtime/icon_pause.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/Realtime/icon_play.gif b/plugins/Realtime/icon_play.gif
deleted file mode 100644
index 794ec85b6..000000000
--- a/plugins/Realtime/icon_play.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index 31e7c2ae6..f43c97de5 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -64,18 +64,9 @@ float: left;
}
#realtime_play {
-background: url(icon_play.gif) no-repeat 47% 47%;
margin-left: 4px;
}
-#realtime_pause {
-background: url(icon_pause.gif) no-repeat 47% 47%;
-}
-
-#realtime_popup {
-background: url(icon_external.gif) no-repeat 0 30%;
-}
-
#queued_counter {
float:left;
line-height:1.2;
diff --git a/plugins/Sample/hello.php b/plugins/Sample/hello.php
index 0cfd8a1c3..dfbd0ad4f 100644
--- a/plugins/Sample/hello.php
+++ b/plugins/Sample/hello.php
@@ -119,13 +119,15 @@ class HelloAction extends Action
}
/**
- * show content in the content area
+ * Show content in the content area
*
* The default StatusNet page has a lot of decorations: menus,
* logos, tabs, all that jazz. This method is used to show
* content in the content area of the page; it's the main
* thing you want to overload.
*
+ * This method also demonstrates use of a plural localized string.
+ *
* @return void
*/
@@ -138,7 +140,9 @@ class HelloAction extends Action
$this->element('p', array('class' => 'greeting'),
sprintf(_m('Hello, %s'), $this->user->nickname));
$this->element('p', array('class' => 'greeting_count'),
- sprintf(_m('I have greeted you %d time(s).'),
+ sprintf(_m('I have greeted you %d time.',
+ 'I have greeted you %d times.',
+ $this->gc->greeting_count),
$this->gc->greeting_count));
}
}
diff --git a/plugins/Sample/locale/Sample.po b/plugins/Sample/locale/Sample.po
new file mode 100644
index 000000000..e0d2aa853
--- /dev/null
+++ b/plugins/Sample/locale/Sample.po
@@ -0,0 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-02-24 16:33-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: hello.php:115 SamplePlugin.php:266
+msgid "Hello"
+msgstr ""
+
+#: hello.php:117 hello.php:141
+#, php-format
+msgid "Hello, %s"
+msgstr ""
+
+#: hello.php:138
+msgid "Hello, stranger!"
+msgstr ""
+
+#: hello.php:143
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
+
+#: SamplePlugin.php:266
+msgid "A warm greeting"
+msgstr ""
+
+#: SamplePlugin.php:277
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#: User_greeting_count.php:163
+#, php-format
+msgid "Could not save new greeting count for %d"
+msgstr ""
+
+#: User_greeting_count.php:176
+#, php-format
+msgid "Could not increment greeting count for %d"
+msgstr ""
diff --git a/scripts/createsim.php b/scripts/createsim.php
index 882d74456..e0b5fc906 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -119,6 +119,9 @@ function newSub($i)
function main($usercount, $noticeavg, $subsavg, $tagmax)
{
+ global $config;
+ $config['site']['dupelimit'] = -1;
+
$n = 1;
newUser(0);
diff --git a/scripts/init_conversation.php b/scripts/init_conversation.php
new file mode 100755
index 000000000..675e7cabd
--- /dev/null
+++ b/scripts/init_conversation.php
@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+common_log(LOG_INFO, 'Initializing conversation table...');
+
+$notice = new Notice();
+$notice->query('select distinct conversation from notice');
+
+while ($notice->fetch()) {
+ $id = $notice->conversation;
+
+ if ($id) {
+ $uri = common_local_url('conversation', array('id' => $id));
+
+ // @fixme db_dataobject won't save our value for an autoincrement
+ // so we're bypassing the insert wrappers
+ $conv = new Conversation();
+ $sql = "insert into conversation (id,uri,created) values(%d,'%s','%s')";
+ $sql = sprintf($sql,
+ $id,
+ $conv->escape($uri),
+ $conv->escape(common_sql_now()));
+ echo "$id ";
+ $conv->query($sql);
+ print "... ";
+ }
+}
+print "done.\n";
diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php
index f882f673a..61a6ac783 100755
--- a/scripts/update_po_templates.php
+++ b/scripts/update_po_templates.php
@@ -63,7 +63,10 @@ xgettext \
--output=locale/$domain.po \
--language=PHP \
--keyword='' \
- --keyword="_m:1" \
+ --keyword="_m:1,1t" \
+ --keyword="_m:1c,2,2t" \
+ --keyword="_m:1,2,3t" \
+ --keyword="_m:1c,2,3,4t" \
END;
foreach ($files as $file) {
@@ -186,6 +189,9 @@ foreach ($args as $arg) {
$allplugins = true;
} elseif (substr($arg, 0, 9) == "--plugin=") {
$plugins[] = substr($arg, 9);
+ } elseif ($arg == '--help') {
+ echo "options: --all --core --plugins --plugin=Foo\n\n";
+ exit(0);
}
}
diff --git a/scripts/updateavatarurl.php b/scripts/updateavatarurl.php
index 617c2e24c..3b6681bae 100644
--- a/scripts/updateavatarurl.php
+++ b/scripts/updateavatarurl.php
@@ -94,11 +94,11 @@ function updateAvatars($user)
}
}
- $orig = clone($avatar);
+ $orig_url = $avatar->url;
$avatar->url = Avatar::url($avatar->filename);
- if ($avatar->url != $orig->url) {
+ if ($avatar->url != $orig_url) {
$sql =
"UPDATE avatar SET url = '" . $avatar->url . "' ".
"WHERE profile_id = " . $avatar->profile_id . " ".
diff --git a/scripts/updateavatarurl_group.php b/scripts/updateavatarurl_group.php
new file mode 100644
index 000000000..ada42de20
--- /dev/null
+++ b/scripts/updateavatarurl_group.php
@@ -0,0 +1,99 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:a';
+$longoptions = array('id=', 'nickname=', 'all');
+
+$helptext = <<<END_OF_UPDATEAVATARURL_HELP
+updateavatarurl_group.php [options]
+update the URLs of all group avatars in the system
+
+ -i --id ID of group to update
+ -n --nickname nickname of the group to update
+ -a --all update all
+
+END_OF_UPDATEAVATARURL_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+try {
+ $user = null;
+
+ if (have_option('i', 'id')) {
+ $id = get_option_value('i', 'id');
+ $group = User_group::staticGet('id', $id);
+ if (empty($group)) {
+ throw new Exception("Can't find group with id '$id'.");
+ }
+ updateGroupAvatars($group);
+ } else if (have_option('n', 'nickname')) {
+ $nickname = get_option_value('n', 'nickname');
+ $group = User_group::staticGet('nickname', $nickname);
+ if (empty($group)) {
+ throw new Exception("Can't find group with nickname '$nickname'");
+ }
+ updateGroupAvatars($group);
+ } else if (have_option('a', 'all')) {
+ $group = new User_group();
+ if ($group->find()) {
+ while ($group->fetch()) {
+ updateGroupAvatars($group);
+ }
+ }
+ } else {
+ show_help();
+ exit(1);
+ }
+} catch (Exception $e) {
+ print $e->getMessage()."\n";
+ exit(1);
+}
+
+function updateGroupAvatars($group)
+{
+ if (!have_option('q', 'quiet')) {
+ print "Updating avatars for group '".$group->nickname."' (".$group->id.")...";
+ }
+
+ if (empty($group->original_logo)) {
+ print "(none found)...";
+ } else {
+ // Using clone here was screwing up the group->find() iteration
+ $orig = User_group::staticGet('id', $group->id);
+
+ $group->original_logo = Avatar::url(basename($group->original_logo));
+ $group->homepage_logo = Avatar::url(basename($group->homepage_logo));
+ $group->stream_logo = Avatar::url(basename($group->stream_logo));
+ $group->mini_logo = Avatar::url(basename($group->mini_logo));
+
+ if (!$group->update($orig)) {
+ throw new Exception("Can't update avatars for group " . $group->nickname . ".");
+ }
+ }
+
+ if (have_option('v', 'verbose')) {
+ print "DONE.";
+ }
+ if (!have_option('q', 'quiet') || have_option('v', 'verbose')) {
+ print "\n";
+ }
+}
diff --git a/plugins/OStatus/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index d7305dede..7bf9cec7c 100644
--- a/plugins/OStatus/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -7,11 +7,10 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
// XXX: we should probably have some common source for this stuff
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
define('STATUSNET', true);
require_once INSTALLDIR . '/lib/common.php';
-require_once INSTALLDIR . '/plugins/OStatus/lib/activity.php';
class ActivityParseTests extends PHPUnit_Framework_TestCase
{
@@ -97,6 +96,51 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
$this->assertFalse(empty($act->actor));
}
+
+ public function testExample5()
+ {
+ global $_example5;
+ $dom = DOMDocument::loadXML($_example5);
+
+ $feed = $dom->documentElement;
+
+ // @todo Test feed elements
+
+ $entries = $feed->getElementsByTagName('entry');
+ $entry = $entries->item(0);
+
+ $act = new Activity($entry, $feed);
+
+ // Post
+ $this->assertEquals($act->verb, ActivityVerb::POST);
+ $this->assertFalse(empty($act->context));
+
+ // Actor w/Portable Contacts stuff
+ $this->assertFalse(empty($act->actor));
+ $this->assertEquals($act->actor->type, ActivityObject::PERSON);
+ $this->assertEquals($act->actor->title, 'Test User');
+ $this->assertEquals($act->actor->id, 'http://example.net/mysite/user/3');
+ $this->assertEquals($act->actor->link, 'http://example.net/mysite/testuser');
+
+ $avatars = $act->actor->avatarLinks;
+
+ $this->assertEquals(
+ $avatars[0]->url,
+ 'http://example.net/mysite/avatar/3-96-20100224004207.jpeg'
+ );
+
+ $this->assertEquals($act->actor->displayName, 'Test User');
+
+ $poco = $act->actor->poco;
+ $this->assertEquals($poco->preferredUsername, 'testuser');
+ $this->assertEquals($poco->address->formatted, 'San Francisco, CA');
+ $this->assertEquals($poco->urls[0]->type, 'homepage');
+ $this->assertEquals($poco->urls[0]->value, 'http://example.com/blog.html');
+ $this->assertEquals($poco->urls[0]->primary, 'true');
+ $this->assertEquals($act->actor->geopoint, '37.7749295 -122.4194155');
+
+ }
+
}
$_example1 = <<<EXAMPLE1
@@ -156,26 +200,26 @@ $_example3 = <<<EXAMPLE3
<feed xmlns="http://www.w3.org/2005/Atom">
- <title>Example Feed</title>
- <subtitle>A subtitle.</subtitle>
- <link href="http://example.org/feed/" rel="self" />
- <link href="http://example.org/" />
- <id>urn:uuid:60a76c80-d399-11d9-b91C-0003939e0af6</id>
- <updated>2003-12-13T18:30:02Z</updated>
- <author>
- <name>John Doe</name>
- <email>johndoe@example.com</email>
- </author>
-
- <entry>
- <title>Atom-Powered Robots Run Amok</title>
- <link href="http://example.org/2003/12/13/atom03" />
- <link rel="alternate" type="text/html" href="http://example.org/2003/12/13/atom03.html"/>
- <link rel="edit" href="http://example.org/2003/12/13/atom03/edit"/>
- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
- <updated>2003-12-13T18:30:02Z</updated>
- <summary>Some text.</summary>
- </entry>
+ <title>Example Feed</title>
+ <subtitle>A subtitle.</subtitle>
+ <link href="http://example.org/feed/" rel="self" />
+ <link href="http://example.org/" />
+ <id>urn:uuid:60a76c80-d399-11d9-b91C-0003939e0af6</id>
+ <updated>2003-12-13T18:30:02Z</updated>
+ <author>
+ <name>John Doe</name>
+ <email>johndoe@example.com</email>
+ </author>
+
+ <entry>
+ <title>Atom-Powered Robots Run Amok</title>
+ <link href="http://example.org/2003/12/13/atom03" />
+ <link rel="alternate" type="text/html" href="http://example.org/2003/12/13/atom03.html"/>
+ <link rel="edit" href="http://example.org/2003/12/13/atom03/edit"/>
+ <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+ <updated>2003-12-13T18:30:02Z</updated>
+ <summary>Some text.</summary>
+ </entry>
</feed>
EXAMPLE3;
@@ -207,3 +251,82 @@ $_example4 = <<<EXAMPLE4
<category term="thetime"></category>
</entry>
EXAMPLE4;
+
+$_example5 = <<<EXAMPLE5
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0">
+ <id>3</id>
+ <title>testuser timeline</title>
+ <subtitle>Updates from testuser on Zach Dev!</subtitle>
+ <logo>http://example.net/mysite/avatar/3-96-20100224004207.jpeg</logo>
+ <updated>2010-02-24T06:38:49+00:00</updated>
+<author>
+ <name>testuser</name>
+ <uri>http://example.net/mysite/user/3</uri>
+
+</author>
+ <link href="http://example.net/mysite/testuser" rel="alternate" type="text/html"/>
+ <link href="http://example.net/mysite/api/statuses/user_timeline/3.atom" rel="self" type="application/atom+xml"/>
+ <link href="http://example.net/mysite/main/sup#3" rel="http://api.friendfeed.com/2008/03#sup" type="application/json"/>
+ <link href="http://example.net/mysite/main/push/hub" rel="hub"/>
+ <link href="http://example.net/mysite/main/salmon/user/3" rel="salmon"/>
+<activity:subject>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+ <id>http://example.net/mysite/user/3</id>
+ <title>Test User</title>
+ <link rel="alternate" type="text/html" href="http://example.net/mysite/testuser"/>
+ <link type="image/jpeg" rel="avatar" href="http://example.net/mysite/avatar/3-96-20100224004207.jpeg"/>
+ <georss:point>37.7749295 -122.4194155</georss:point>
+
+<poco:preferredUsername>testuser</poco:preferredUsername>
+<poco:displayName>Test User</poco:displayName>
+<poco:note>Just another test user.</poco:note>
+<poco:address>
+ <poco:formatted>San Francisco, CA</poco:formatted>
+</poco:address>
+<poco:urls>
+ <poco:type>homepage</poco:type>
+ <poco:value>http://example.com/blog.html</poco:value>
+ <poco:primary>true</poco:primary>
+
+</poco:urls>
+</activity:subject>
+<entry>
+ <title>Hey man, is that Freedom Code?! #freedom #hippy</title>
+ <summary>Hey man, is that Freedom Code?! #freedom #hippy</summary>
+<author>
+ <name>testuser</name>
+ <uri>http://example.net/mysite/user/3</uri>
+</author>
+<activity:actor>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+ <id>http://example.net/mysite/user/3</id>
+ <title>Test User</title>
+ <link rel="alternate" type="text/html" href="http://example.net/mysite/testuser"/>
+ <link type="image/jpeg" rel="avatar" href="http://example.net/mysite/avatar/3-96-20100224004207.jpeg"/>
+ <georss:point>37.7749295 -122.4194155</georss:point>
+
+<poco:preferredUsername>testuser</poco:preferredUsername>
+<poco:displayName>Test User</poco:displayName>
+<poco:note>Just another test user.</poco:note>
+<poco:address>
+ <poco:formatted>San Francisco, CA</poco:formatted>
+</poco:address>
+<poco:urls>
+ <poco:type>homepage</poco:type>
+ <poco:value>http://example.com/blog.html</poco:value>
+ <poco:primary>true</poco:primary>
+
+</poco:urls>
+</activity:actor>
+ <link rel="alternate" type="text/html" href="http://example.net/mysite/notice/7"/>
+ <id>http://example.net/mysite/notice/7</id>
+ <published>2010-02-24T00:53:06+00:00</published>
+ <updated>2010-02-24T00:53:06+00:00</updated>
+ <link rel="ostatus:conversation" href="http://example.net/mysite/conversation/7"/>
+ <content type="html">Hey man, is that Freedom Code?! #&lt;span class=&quot;tag&quot;&gt;&lt;a href=&quot;http://example.net/mysite/tag/freedom&quot; rel=&quot;tag&quot;&gt;freedom&lt;/a&gt;&lt;/span&gt; #&lt;span class=&quot;tag&quot;&gt;&lt;a href=&quot;http://example.net/mysite/tag/hippy&quot; rel=&quot;tag&quot;&gt;hippy&lt;/a&gt;&lt;/span&gt;</content>
+ <georss:point>37.8313160 -122.2852473</georss:point>
+
+</entry>
+</feed>
+EXAMPLE5;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 380975e32..52f97f6b1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1490,6 +1490,7 @@ text-align:center;
}
.aside .tag-cloud {
font-size:0.8em;
+word-wrap:break-word;
}
.tag-cloud li {
display:inline;
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
new file mode 100644
index 000000000..ea582149f
--- /dev/null
+++ b/theme/base/images/icons/README
@@ -0,0 +1,54 @@
+/**
+ * @author Paul Jarvis http://code.google.com/p/twotiny/
+ * @license http://dev.perl.org/licenses/ Artistic License/GPL
+ * @note
+ White left arrow with green background
+ White right arrow with green background
+ White clip with green background
+ White heart with green background
+ White reply with green background
+ White garbage with green background
+ White pencil with green background
+ White envelope with green background
+ White speech bubble with green background
+ White shield with green background
+ White asterisk with green background
+ White x with green background
+ White plus with green background
+ White minus with green background
+ White skull with green background
+ White recycle with green background
+ White external with green background
+ White key with green background
+ White flag with green background
+ White checkmark with green background
+ White reject with green background
+ White play with green background
+ White pause with green background
+ */
+
+
+/**
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ * @note
+ Green clip with transparent background
+ Green heart with white background
+ White person with tie with green background
+ White sherif badge with green background
+ White boxes with green background
+ White speech bubble broken with green background
+ Green recycle with transparent background
+ Green pin with white background
+ White pin with green background
+ White underscore with green background
+ White C with green background
+ */
+
+Created by various authors
+* FOAF icon from http://iandavis.com/2006/foaf-icons/ with Public Domain license
+* Atom feed icon from http://intertwingly.net/wiki/pie/Icon with Public Domain license
+* RSS feed icon from http://www.feedicons.com/ (Mozilla, Microsoft, Matt Brett) with MPL/GPL/LGPL tri-license
+* Processing icon from/by Unknown with Unknown license //FIXME
diff --git a/theme/base/images/icons/icon_geo.png b/theme/base/images/icons/icon_geo.png
deleted file mode 100644
index 8df245699..000000000
--- a/theme/base/images/icons/icon_geo.png
+++ /dev/null
Binary files differ
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index 6f284f023..be884ff48 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 726062e47..285c2ad83 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1628,15 +1628,23 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
+.form_remote_authorize input.submit,
.entity_subscribe a,
.entity_moderation p,
.entity_sandbox input.submit,
.entity_silence input.submit,
.entity_delete input.submit,
.notice-options .repeated,
-.form_notice a#notice_data-geo_name,
.form_notice label[for=notice_data-geo],
-button.minimize {
+button.minimize,
+.form_reset_key input.submit,
+.entity_clear input.submit,
+.entity_flag input.submit,
+.entity_flag p,
+.entity_subscribe input.submit,
+#realtime_play,
+#realtime_pause,
+#realtime_popup {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@@ -1899,6 +1907,31 @@ background-position: 5px -1445px;
.entity_delete input.submit {
background-position: 5px -1511px;
}
+.form_reset_key input.submit {
+background-position: 5px -1973px;
+}
+.entity_clear input.submit {
+background-position: 5px -2039px;
+}
+.entity_flag input.submit,
+.entity_flag p {
+background-position: 5px -2105px;
+}
+.entity_subscribe input.accept {
+background-position: 5px -2171px;
+}
+.entity_subscribe input.reject {
+background-position: 5px -2237px;
+}
+#realtime_play {
+background-position: 0 -2308px;
+}
+#realtime_pause {
+background-position: 0 -2374px;
+}
+#realtime_popup {
+background-position: 0 -1714px;
+}
/* NOTICES */
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index deb985909..8ae2b4014 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -197,7 +197,10 @@ button.minimize,
.entity_clear input.submit,
.entity_flag input.submit,
.entity_flag p,
-.entity_subscribe input.submit {
+.entity_subscribe input.submit,
+#realtime_play,
+#realtime_pause,
+#realtime_popup {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@@ -363,6 +366,16 @@ background-position: 5px -2171px;
.entity_subscribe input.reject {
background-position: 5px -2237px;
}
+#realtime_play {
+background-position: 0 -2308px;
+}
+#realtime_pause {
+background-position: 0 -2374px;
+}
+#realtime_popup {
+background-position: 0 -1714px;
+}
+
/* NOTICES */
.notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 0e54d82e2..737e3a103 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -81,7 +81,8 @@ background-color:transparent;
input:focus, textarea:focus, select:focus,
.form_notice.warning #notice_data-text,
.form_notice.warning #notice_text-count,
-.form_settings .form_note {
+.form_settings .form_note,
+.entity_actions .dialogbox .form_data input:focus {
border-color:#9BB43E;
}
input.submit {
@@ -197,7 +198,10 @@ button.minimize,
.entity_clear input.submit,
.entity_flag input.submit,
.entity_flag p,
-.entity_subscribe input.submit {
+.entity_subscribe input.submit,
+#realtime_play,
+#realtime_pause,
+#realtime_popup {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@@ -362,6 +366,15 @@ background-position: 5px -2171px;
.entity_subscribe input.reject {
background-position: 5px -2237px;
}
+#realtime_play {
+background-position: 0 -2308px;
+}
+#realtime_pause {
+background-position: 0 -2374px;
+}
+#realtime_popup {
+background-position: 0 -1714px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/otalk/css/base.css b/theme/otalk/css/base.css
deleted file mode 100644
index 8af86f9db..000000000
--- a/theme/otalk/css/base.css
+++ /dev/null
@@ -1,1211 +0,0 @@
-/** theme: otalk base
- *
- * @package StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-* { margin:0; padding:0; }
-img { display:block; border:0; }
-a abbr { cursor: pointer; border-bottom:0; }
-table { border-collapse:collapse; }
-ol { list-style-position:inside; }
-html { font-size: 87.5%; background-color:#fff; }
-body {
-background-color:#fff;
-color:#000;
-font-family:sans-serif;
-font-size:1em;
-line-height:1.65;
-position:relative;
-}
-h1,h2,h3,h4,h5,h6 {
-margin-bottom:7px;
-overflow:hidden;
-}
-h1 {
-font-size:1.4em;
-margin-bottom:18px;
-}
-#showstream h1 { display:none; }
-h2 { font-size:1.3em; }
-h3 { font-size:1.2em; }
-h4 { font-size:1.1em; }
-h5 { font-size:1em; }
-h6 { font-size:0.9em; }
-
-caption {
-font-weight:bold;
-}
-legend {
-font-weight:bold;
-font-size:1.3em;
-}
-input, textarea, select, option {
-padding:4px;
-font-family:sans-serif;
-font-size:1em;
-}
-input, textarea, select {
-border-width:2px;
-border-style: solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
-input.submit {
-font-weight:bold;
-cursor:pointer;
-}
-textarea {
-overflow:auto;
-}
-option {
-padding-bottom:0;
-}
-fieldset {
-padding:0;
-border:0;
-}
-form ul li {
-list-style-type:none;
-margin:0 0 18px 0;
-}
-form label {
-font-weight:bold;
-}
-input.checkbox {
-position:relative;
-top:2px;
-left:0;
-border:0;
-}
-
-.error,
-.success {
-padding:4px 7px;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-margin-bottom:18px;
-}
-form label.submit {
-display:none;
-}
-
-.form_settings {
-clear:both;
-}
-
-.form_settings fieldset {
-margin-bottom:29px;
-}
-.form_settings input.remove {
-margin-left:11px;
-}
-.form_settings .form_data li {
-width:100%;
-float:left;
-}
-.form_settings .form_data label {
-float:left;
-}
-.form_settings .form_data textarea,
-.form_settings .form_data select,
-.form_settings .form_data input {
-margin-left:11px;
-float:left;
-}
-.form_settings .form_data input.submit {
-margin-left:0;
-}
-
-.form_settings label {
-margin-top:2px;
-width:152px;
-}
-
-.form_actions label {
-display:none;
-}
-.form_guide {
-font-style:italic;
-}
-
-.form_settings #settings_autosubscribe label {
-display:inline;
-font-weight:bold;
-}
-
-#form_settings_profile legend,
-#form_login legend,
-#form_register legend,
-#form_password legend,
-#form_settings_avatar legend,
-#newgroup legend,
-#editgroup legend,
-#form_tag_user legend,
-#form_remote_subscribe legend,
-#form_openid_login legend,
-#form_search legend,
-#form_invite legend,
-#form_notice_delete legend,
-#form_password_recover legend,
-#form_password_change legend {
-display:none;
-}
-
-.form_settings .form_data p.form_guide {
-clear:both;
-margin-left:163px;
-margin-bottom:0;
-}
-
-.form_settings p {
-margin-bottom:11px;
-}
-
-.form_settings input.checkbox {
-margin-top:3px;
-margin-left:0;
-}
-.form_settings label.checkbox {
-font-weight:normal;
-margin-top:0;
-margin-right:0;
-margin-left:11px;
-float:left;
-width:90%;
-}
-
-
-#form_login p.form_guide,
-#form_register #settings_rememberme p.form_guide,
-#form_openid_login #settings_rememberme p.form_guide,
-#settings_twitter_remove p.form_guide,
-#form_search ul.form_data #q {
-margin-left:0;
-}
-
-.form_settings .form_note {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-padding:0 7px;
-}
-
-
-.form_settings input.form_action-primary {
-padding:0;
-}
-.form_settings input.form_action-secondary {
-margin-left:29px;
-}
-
-#form_search .submit {
-margin-left:11px;
-}
-
-address {
-float:left;
-margin-bottom:18px;
-margin-left:18px;
-}
-address.vcard img.logo {
-margin-right:0;
-}
-address .fn {
-font-weight:bold;
-}
-address img + .fn {
-display:none;
-}
-
-#header {
-width:100%;
-position:relative;
-float:left;
-padding-top:18px;
-margin-bottom:29px;
-}
-
-#site_nav_global_primary {
-float:right;
-margin-right:18px;
-margin-bottom:11px;
-margin-left:18px;
-}
-#site_nav_global_primary ul li {
-display:inline;
-margin-left:11px;
-}
-
-.system_notice dt {
-font-weight:bold;
-text-transform:uppercase;
-display:none;
-}
-
-#site_notice {
-position:absolute;
-top:65px;
-right:18px;
-width:250px;
-width:24%;
-}
-#page_notice {
-clear:both;
-margin-bottom:18px;
-}
-
-
-#anon_notice {
-float:left;
-width:43.2%;
-padding:1.1%;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-border-width:2px;
-border-style:solid;
-line-height:1.5;
-font-size:1.1em;
-font-weight:bold;
-}
-
-
-#footer {
-float:left;
-width:64%;
-padding:18px;
-}
-
-#site_nav_local_views {
-float:left;
-}
-#site_nav_local_views dt {
-display:none;
-}
-#site_nav_local_views li {
-float:left;
-margin-right:18px;
-list-style-type:none;
-}
-#site_nav_local_views a {
-float:left;
-text-decoration:none;
-padding:4px 11px;
--moz-border-radius-topleft:4px;
--moz-border-radius-topright:4px;
--webkit-border-top-left-radius:4px;
--webkit-border-top-right-radius:4px;
-border-width:0;
-border-style:solid;
-border-bottom:0;
-text-shadow: 2px 2px 2px #ddd;
-font-weight:bold;
-}
-#site_nav_local_views .nav {
-float:left;
-width:100%;
-border-bottom-width:1px;
-border-bottom-style:solid;
-}
-
-#site_nav_global_primary dt,
-#site_nav_global_secondary dt {
-display:none;
-}
-
-#site_nav_global_secondary {
-margin-bottom:11px;
-}
-
-#site_nav_global_secondary ul li {
-display:inline;
-margin-right:11px;
-}
-#export_data li a {
-padding-left:20px;
-}
-#export_data li a.foaf {
-padding-left:30px;
-}
-#export_data li a.export_vcard {
-padding-left:28px;
-}
-
-#export_data ul {
-display:inline;
-}
-#export_data li {
-list-style-type:none;
-display:inline;
-margin-left:11px;
-}
-#export_data li:first-child {
-margin-left:0;
-}
-
-#licenses {
-font-size:0.9em;
-}
-
-#licenses dt {
-font-weight:bold;
-display:none;
-}
-#licenses dd {
-margin-bottom:11px;
-line-height:1.5;
-}
-
-#site_content_license_cc {
-margin-bottom:0;
-}
-#site_content_license_cc img {
-display:inline;
-vertical-align:top;
-margin-right:4px;
-}
-
-#wrap {
-margin:0 auto;
-width:100%;
-min-width:760px;
-max-width:1003px;
-overflow:hidden;
-}
-
-#core {
-position:relative;
-width:100%;
-float:left;
-margin-bottom:1em;
-}
-
-#content {
-width:67.9%;
-min-height:259px;
-padding-top:1.795%;
-padding-bottom:1.795%;
-float:left;
-clear:left;
-border-radius:7px;
--moz-border-radius:7px;
--moz-border-radius-topleft:0;
--webkit-border-radius:7px;
--webkit-border-top-left-radius:0;
-border-style:solid;
-border-width:0;
-margin-bottom:18px;
-}
-
-#content_inner {
-position:relative;
-width:100%;
-float:left;
-}
-
-#aside_primary {
-width:27.917%;
-min-height:259px;
-float:left;
-padding:1.795%;
-margin-left:0.385%;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-border-width:1px;
-border-style:solid;
-}
-
-#form_notice {
-width:45.664%;
-float:left;
-position:relative;
-line-height:1;
-}
-#form_notice fieldset {
-border:0;
-padding:0;
-}
-#form_notice legend {
-display:none;
-}
-#form_notice textarea {
-float:left;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-width:80.789%;
-height:67px;
-line-height:1.5;
-padding:7px 7px 16px 7px;
-}
-#form_notice label {
-display:block;
-float:left;
-font-size:1.3em;
-margin-bottom:7px;
-}
-#form_notice #notice_submit label {
-display:none;
-}
-#form_notice .form_note {
-position:absolute;
-top:99px;
-right:98px;
-z-index:9;
-}
-#form_notice .form_note dt {
-font-weight:bold;
-display:none;
-}
-#notice_text-count {
-font-weight:bold;
-line-height:1.15;
-padding:1px 2px;
-}
-#form_notice #notice_action-submit {
-width:14%;
-height:47px;
-padding:0;
-position:absolute;
-bottom:0;
-right:0;
-}
-#form_notice label[for=to] {
-margin-top:7px;
-}
-#form_notice select[id=to] {
-margin-bottom:7px;
-margin-left:18px;
-float:left;
-}
-
-
-/* entity_profile */
-.entity_profile {
-position:relative;
-width:521px;
-min-height:123px;
-float:left;
-margin-bottom:18px;
-margin-left:0;
-overflow:hidden;
-}
-.entity_profile dt,
-#entity_statistics dt {
-font-weight:bold;
-}
-.entity_profile dd {
-display:inline;
-}
-
-.entity_profile .entity_depiction {
-float:left;
-width:96px;
-margin-right:18px;
-margin-bottom:18px;
-}
-
-.entity_profile .entity_fn,
-.entity_profile .entity_nickname,
-.entity_profile .entity_location,
-.entity_profile .entity_url,
-.entity_profile .entity_note,
-.entity_profile .entity_tags {
-margin-left:113px;
-margin-bottom:4px;
-}
-
-.entity_profile .entity_fn,
-.entity_profile .entity_nickname {
-margin-left:11px;
-display:inline;
-font-weight:bold;
-}
-.entity_profile .entity_nickname {
-margin-left:0;
-}
-
-.entity_profile .entity_fn dd:before {
-content: "(";
-font-weight:normal;
-}
-.entity_profile .entity_fn dd:after {
-content: ")";
-font-weight:normal;
-}
-
-.entity_profile dt {
-display:none;
-}
-.entity_profile h2 {
-display:none;
-}
-/* entity_profile */
-
-
-/*entity_actions*/
-.entity_actions {
-float:left;
-margin-left:4.35%;
-max-width:25%;
-}
-.entity_actions h2 {
-display:none;
-}
-.entity_actions ul {
-list-style-type:none;
-}
-.entity_actions li {
-margin-bottom:4px;
-}
-.entity_actions li:first-child {
-border-top:0;
-}
-.entity_actions fieldset {
-border:0;
-padding:0;
-}
-.entity_actions legend {
-display:none;
-}
-
-.entity_actions input.submit {
-display:block;
-text-align:left;
-width:100%;
-}
-.entity_actions a,
-.entity_nudge p,
-.entity_remote_subscribe {
-text-decoration:none;
-font-weight:bold;
-display:block;
-}
-
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p {
-border:0;
-padding-left:20px;
-}
-
-.entity_edit a,
-.entity_send-a-message a,
-.entity_nudge p {
-padding:4px 4px 4px 23px;
-}
-
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-.entity_actions .accept {
-margin-bottom:18px;
-}
-
-.entity_tags ul {
-list-style-type:none;
-display:inline;
-}
-.entity_tags li {
-display:inline;
-margin-right:4px;
-}
-
-.aside .section {
-margin-bottom:29px;
-clear:both;
-float:left;
-width:100%;
-}
-.aside .section h2 {
-text-transform:uppercase;
-font-size:1em;
-}
-
-#entity_statistics dt,
-#entity_statistics dd {
-display:inline;
-}
-#entity_statistics dt:after {
-content: ":";
-}
-
-.section ul.entities {
-float:left;
-width:100%;
-}
-.section .entities li {
-list-style-type:none;
-float:left;
-margin-right:7px;
-margin-bottom:7px;
-}
-.section .entities li .photo {
-margin-right:0;
-margin-bottom:0;
-}
-.section .entities li .fn {
-display:none;
-}
-
-.aside .section p,
-.aside .section .more {
-clear:both;
-}
-
-.profile .entity_profile {
-margin-bottom:0;
-min-height:60px;
-}
-
-
-.profile .form_group_join legend,
-.profile .form_group_leave legend,
-.profile .form_user_subscribe legend,
-.profile .form_user_unsubscribe legend {
-display:none;
-}
-
-.profiles {
-list-style-type:none;
-}
-.profile .entity_profile .entity_location {
-width:auto;
-clear:none;
-margin-left:11px;
-}
-.profile .entity_profile dl,
-.profile .entity_profile dd {
-display:inline;
-float:none;
-}
-.profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url,
-.profile .entity_profile .entity_tags,
-.profile .entity_profile .form_subscription_edit {
-margin-left:59px;
-clear:none;
-display:block;
-width:auto;
-}
-.profile .entity_profile .entity_tags dt {
-display:inline;
-margin-right:11px;
-}
-
-
-.profile .entity_profile .form_subscription_edit label {
-font-weight:normal;
-margin-right:11px;
-}
-
-
-/* NOTICE */
-.notice,
-.profile {
-position:relative;
-clear:both;
-float:left;
-width:100%;
-border-width:0;
-border-style:solid;
-margin-bottom:29px;
-}
-.notices li {
-list-style-type:none;
-}
-
-#content .notice {
-width:37%;
-margin-left:17px;
-margin-bottom:47px;
-clear:none;
-overflow:hidden;
-padding: 0 0 0 65px;
-min-height:235px;
-}
-
-#aside_primary .notice {
-margin-bottom:18px;
-}
-
-#shownotice #content .notice {
-width:96%;
-}
-
-
-/* NOTICES */
-#notices_primary {
-float:left;
-width:100%;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-}
-#notices_primary h2 {
-display:none;
-}
-.notice-data a span {
-display:block;
-padding-left:28px;
-}
-
-.notice .author {
-margin-right:11px;
-}
-
-#content .notice .author {
-/*overflow:hidden;*/
-}
-
-.fn {
-overflow:hidden;
-}
-
-.notice .author .fn {
-font-weight:bold;
-}
-
-.notice .author .photo {
-margin-bottom:0;
-}
-
-#content .notice .author .photo {
-margin-left:-83px;
-padding-right:17px;
-}
-
-
-.vcard .photo {
-display:inline;
-margin-right:11px;
-margin-bottom:11px;
-float:left;
-}
-.vcard .url {
-text-decoration:none;
-}
-.vcard .url:hover {
-text-decoration:underline;
-}
-
-.notice .entry-title {
-float:left;
-width:100%;
-overflow:hidden;
-}
-#content .notice .entry-title {
-overflow:visible;
-margin-bottom:11px;
-padding:18px;
-width:85%;
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-min-height:161px;
-}
-
-#shownotice .notice .entry-title {
-font-size:2.2em;
-}
-
-.notice p.entry-content {
-display:inline;
-}
-
-#content .notice p.entry-content
-overflow:hidden;
-}
-
-.notice p.entry-content .vcard a {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
-.notice div.entry-content {
-clear:left;
-float:left;
-font-size:0.95em;
-}
-#showstream .notice div.entry-content {
-margin-left:0;
-}
-
-.notice .notice-options a,
-.notice .notice-options input {
-float:left;
-font-size:1.025em;
-}
-
-.notice div.entry-content dl,
-.notice div.entry-content dt,
-.notice div.entry-content dd {
-display:inline;
-}
-
-.notice div.entry-content .timestamp dt,
-.notice div.entry-content .response dt {
-display:none;
-}
-.notice div.entry-content .timestamp a {
-display:inline-block;
-}
-.notice div.entry-content .device dt {
-text-transform:lowercase;
-}
-
-
-
-.notice-data {
-position:absolute;
-top:18px;
-right:0;
-min-height:50px;
-margin-bottom:4px;
-}
-.notice .entry-content .notice-data dt {
-display:none;
-}
-
-.notice-data a {
-display:block;
-outline:none;
-}
-
-.notice-options {
-position:absolute;
-top:120px;
-left:30px;
-font-size:0.95em;
-}
-
-.notice-options a {
-float:left;
-}
-.notice-options .notice_delete,
-.notice-options .notice_reply,
-.notice-options .form_favor,
-.notice-options .form_disfavor {
-position:absolute;
-left:0;
-}
-.notice-options .form_favor,
-.notice-options .form_disfavor {
-top:0;
-}
-.notice-options .notice_reply {
-top:29px;
-}
-.notice-options .notice_delete {
-top:58px;
-}
-.notice-options .notice_reply dt {
-display:none;
-}
-
-.notice-options input,
-.notice-options a {
-text-indent:-9999px;
-outline:none;
-}
-
-.notice-options .notice_reply a,
-.notice-options input.submit {
-display:block;
-border:0;
-}
-.notice-options .notice_reply a,
-.notice-options .notice_delete a {
-text-decoration:none;
-padding-left:16px;
-}
-
-.notice-options form input.submit {
-width:16px;
-padding:2px 0;
-}
-
-.notice-options .notice_delete dt,
-.notice-options .form_favor legend,
-.notice-options .form_disfavor legend {
-display:none;
-}
-.notice-options .notice_delete fieldset,
-.notice-options .form_favor fieldset,
-.notice-options .form_disfavor fieldset {
-border:0;
-padding:0;
-}
-
-
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
-#new_group, #group_search {
-margin-bottom:18px;
-}
-#new_group a {
-padding-left:20px;
-}
-
-
-#filter_tags {
-margin-bottom:11px;
-float:left;
-}
-#filter_tags dt {
-display:none;
-}
-#filter_tags ul {
-list-style-type:none;
-}
-#filter_tags ul li {
-float:left;
-margin-left:7px;
-padding-left:7px;
-border-left-width:1px;
-border-left-style:solid;
-}
-#filter_tags ul li.child_1 {
-margin-left:0;
-border-left:0;
-padding-left:0;
-}
-#filter_tags ul li#filter_tags_all a {
-font-weight:bold;
-margin-top:7px;
-float:left;
-}
-
-#filter_tags ul li#filter_tags_item label {
-margin-right:7px;
-}
-#filter_tags ul li#filter_tags_item label,
-#filter_tags ul li#filter_tags_item select {
-display:inline;
-}
-#filter_tags ul li#filter_tags_item p {
-float:left;
-margin-left:38px;
-}
-#filter_tags ul li#filter_tags_item input {
-position:relative;
-top:3px;
-left:3px;
-}
-
-
-
-.pagination {
-float:left;
-clear:both;
-width:100%;
-margin-top:18px;
-}
-
-.pagination dt {
-font-weight:bold;
-display:none;
-}
-
-.pagination .nav {
-float:left;
-width:100%;
-list-style-type:none;
-}
-
-.pagination .nav_prev {
-float:left;
-}
-.pagination .nav_next {
-float:right;
-}
-
-.pagination a {
-display:block;
-text-decoration:none;
-font-weight:bold;
-padding:7px;
-border-width:1px;
-border-style:solid;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-border-radius:7px;
-}
-
-.pagination .nav_prev a {
-padding-left:30px;
-}
-.pagination .nav_next a {
-padding-right:30px;
-}
-/* END: NOTICE */
-
-
-.hentry .entry-content p {
-margin-bottom:18px;
-}
-.hentry entry-content ol,
-.hentry .entry-content ul {
-list-style-position:inside;
-}
-.hentry .entry-content li {
-margin-bottom:18px;
-}
-.hentry .entry-content li li {
-margin-left:18px;
-}
-
-
-
-
-/* TOP_POSTERS */
-.section tbody td {
-padding-right:11px;
-padding-bottom:11px;
-}
-.section .vcard .photo {
-margin-right:7px;
-margin-bottom:0;
-}
-
-.section .notice {
-padding-top:7px;
-padding-bottom:7px;
-border-top:0;
-}
-
-.section .notice:first-child {
-padding-top:0;
-}
-
-.section .notice .author {
-margin-right:0;
-}
-.section .notice .author .fn {
-display:none;
-}
-
-
-/* tagcloud */
-.tag-cloud {
-list-style-type:none;
-text-align:center;
-}
-.aside .tag-cloud {
-font-size:0.8em;
-}
-.tag-cloud li {
-display:inline;
-margin-right:7px;
-line-height:1.25;
-}
-.aside .tag-cloud li {
-line-height:1.5;
-}
-.tag-cloud li a {
-text-decoration:none;
-}
-#tagcloud.section dt {
-text-transform:uppercase;
-font-weight:bold;
-}
-.tag-cloud-1 {
-font-size:1em;
-}
-.tag-cloud-2 {
-font-size:1.25em;
-}
-.tag-cloud-3 {
-font-size:1.75em;
-}
-.tag-cloud-4 {
-font-size:2em;
-}
-.tag-cloud-5 {
-font-size:2.25em;
-}
-.tag-cloud-6 {
-font-size:2.75em;
-}
-.tag-cloud-7 {
-font-size:3.25em;
-}
-
-#publictagcloud #tagcloud.section dt {
-display:none;
-}
-
-#form_settings_photo .form_data {
-clear:both;
-}
-
-#form_settings_avatar li {
-width:auto;
-}
-#form_settings_avatar input {
-margin-left:0;
-}
-#avatar_original,
-#avatar_preview {
-float:left;
-}
-#avatar_preview {
-margin-left:29px;
-}
-#avatar_preview_view {
-height:96px;
-width:96px;
-margin-bottom:18px;
-overflow:hidden;
-}
-
-#settings_attach,
-#form_settings_avatar .form_actions {
-clear:both;
-}
-
-#form_settings_avatar .form_actions {
-margin-bottom:0;
-}
-
-#form_settings_design #settings_design_color .form_data,
-#form_settings_design #color-picker {
-float:left;
-}
-#form_settings_design #settings_design_color .form_data {
-width:400px;
-margin-right:28px;
-}
-
-.instructions ul {
-list-style-position:inside;
-}
-.instructions p,
-.instructions ul {
-margin-bottom:18px;
-}
-.help dt {
-display:none;
-}
-.guide {
-clear:both;
-}
diff --git a/theme/otalk/css/display.css b/theme/otalk/css/display.css
deleted file mode 100644
index bdfaea749..000000000
--- a/theme/otalk/css/display.css
+++ /dev/null
@@ -1,292 +0,0 @@
-/** theme: otalk
- *
- * @package StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-@import url(base.css);
-
-html {
-}
-
-html,
-body,
-a:active {
-}
-body {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-font-size:1em;
-background:#ddd url(../images/illustrations/illu_pattern-01.png) repeat 0 0;
-background-color:rgba(127, 127, 127, 0.1);
-}
-address {
-margin-right:7.18%;
-}
-
-input, textarea, select, option {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-input, textarea, select,
-.entity_remote_subscribe {
-border-color:#aaa;
-}
-#filter_tags ul li {
-border-color:#ddd;
-}
-
-.form_settings input.form_action-primary {
-background:none;
-}
-
-input.submit,
-#form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
-background-color:#9BB43E;
-}
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
-}
-input.submit,
-.entity_remote_subscribe {
-color:#fff;
-}
-
-a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_settings input.form_action-primary {
-color:#8F0000;
-}
-
-.notice,
-.profile {
-border-color:#CEE1E9;
-}
-#content .notice .entry-title,
-input, textarea, select, option,
-.pagination .nav_prev a,
-.pagination .nav_next a {
-background-color:rgba(255,255,255,0.8);
-}
-
-#content .notices li.hover .entry-title {
-background-color:rgba(255,255,255,0.9);
-}
-
-#content .notice:nth-child(1) .entry-title {
-background-color:rgba(255,255,255,0.95);
-}
-#content .notice:nth-child(2) .entry-title {
-background-color:rgba(255,255,255,0.9);
-}
-#content .notice:nth-child(3) .entry-title {
-background-color:rgba(255,255,255,0.8);
-}
-#content .notice:nth-child(4) .entry-title {
-background-color:rgba(255,255,255,0.7);
-}
-#content .notice:nth-child(5) .entry-title {
-background-color:rgba(255,255,255,0.6);
-}
-#content .notice:nth-child(6) .entry-title {
-background-color:rgba(255,255,255,0.5);
-}
-#content .notice:nth-child(7) .entry-title {
-background-color:rgba(255,255,255,0.4);
-}
-#content .notice:nth-child(8) .entry-title {
-background-color:rgba(255,255,255,0.3);
-}
-#content .notice:nth-child(9) .entry-title {
-background-color:rgba(255,255,255,0.2);
-}
-#content .notice:nth-child(10) {
-background-color:rgba(255,255,255,0.1);
-}
-
-
-#content .notice .author .photo {
-background:url(../images/illustrations/illu_arrow-left-01.gif) no-repeat 100% 0;
-}
-
-.section .profile {
-border-top-color:#87B4C8;
-}
-
-#aside_primary {
-background-color:rgba(206, 225, 233,0.5);
-}
-
-#notice_text-count {
-color:#333;
-}
-#form_notice.warning #notice_text-count {
-color:#000;
-}
-#form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-}
-
-#content,
-#site_nav_local_views .nav,
-#site_nav_local_views a,
-#aside_primary {
-border-color:#fff;
-}
-#content,
-#site_nav_local_views .current a {
-background-color:transparent;
-/*background-color:red;*/
-}
-
-#site_nav_local_views .current a {
-background-color:transparent;
-}
-
-#site_nav_local_views a {
-background-color:rgba(127, 127, 127, 0.2);
-}
-#site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.8);
-}
-
-.error {
-background-color:#F7E8E8;
-}
-.success {
-background-color:#EFF3DC;
-}
-
-#anon_notice {
-background-color:rgba(206, 225, 233, 0.7);
-color:#fff;
-border-color:#fff;
-}
-
-#showstream #anon_notice {
-background-color:rgba(155, 180, 62, 0.7);
-}
-
-#export_data li a {
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-#export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.png);
-}
-#export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.png);
-}
-#export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
-}
-
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.entity_nudge p {
-background-position: 0 40%;
-background-repeat: no-repeat;
-background-color:transparent;
-}
-.form_group_join input.submit,
-.form_group_leave input.submit
-.form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
-color:#fff;
-}
-.form_user_unsubscribe input.submit,
-.form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
-}
-
-.entity_edit a {
-background-image:url(../../base/images/icons/twotone/green/edit.gif);
-}
-.entity_send-a-message a {
-background-image:url(../../base/images/icons/twotone/green/quote.gif);
-}
-.entity_nudge p,
-.form_user_nudge input.submit {
-background-image:url(../../base/images/icons/twotone/green/mail.gif);
-}
-.form_user_block input.submit,
-.form_user_unblock input.submit {
-background-image:url(../../base/images/icons/twotone/green/shield.gif);
-}
-
-/* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
-.notice-options .notice_reply a,
-.notice-options form input.submit {
-background-color:transparent;
-}
-.notice-options .notice_reply a {
-background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
-}
-.notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
-}
-.notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
-}
-.notice-options .notice_delete a {
-background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
-}
-
-.notices div.entry-content,
-.notices div.notice-options {
-opacity:0.4;
-}
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-div.entry-content {
-color:#333;
-}
-div.notice-options a,
-div.notice-options input {
-font-family:sans-serif;
-}
-.notices li.hover {
-/*background-color:#fcfcfc;*/
-}
-/*END: NOTICES */
-
-#new_group a {
-background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
-}
-
-.pagination .nav_prev a,
-.pagination .nav_next a {
-background-repeat:no-repeat;
-border-color:#CEE1E9;
-}
-.pagination .nav_prev a {
-background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
-}
-.pagination .nav_next a {
-background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
-}
diff --git a/theme/otalk/css/ie.css b/theme/otalk/css/ie.css
deleted file mode 100644
index 2f463bb44..000000000
--- a/theme/otalk/css/ie.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/* IE specific styles */
-
-.notice-options input.submit {
-color:#fff;
-}
-
-#site_nav_local_views a {
-background-color:#D0DFE7;
-}
diff --git a/theme/otalk/default-avatar-mini.png b/theme/otalk/default-avatar-mini.png
deleted file mode 100644
index 38b8692b4..000000000
--- a/theme/otalk/default-avatar-mini.png
+++ /dev/null
Binary files differ
diff --git a/theme/otalk/default-avatar-profile.png b/theme/otalk/default-avatar-profile.png
deleted file mode 100644
index f8357d4fc..000000000
--- a/theme/otalk/default-avatar-profile.png
+++ /dev/null
Binary files differ
diff --git a/theme/otalk/default-avatar-stream.png b/theme/otalk/default-avatar-stream.png
deleted file mode 100644
index 6b63baa70..000000000
--- a/theme/otalk/default-avatar-stream.png
+++ /dev/null
Binary files differ
diff --git a/theme/otalk/images/illustrations/illu_arrow-left-01.gif b/theme/otalk/images/illustrations/illu_arrow-left-01.gif
deleted file mode 100644
index 197775976..000000000
--- a/theme/otalk/images/illustrations/illu_arrow-left-01.gif
+++ /dev/null
Binary files differ
diff --git a/theme/otalk/images/illustrations/illu_pattern-01.png b/theme/otalk/images/illustrations/illu_pattern-01.png
deleted file mode 100644
index 5a72eafcb..000000000
--- a/theme/otalk/images/illustrations/illu_pattern-01.png
+++ /dev/null
Binary files differ
diff --git a/theme/otalk/logo.png b/theme/otalk/logo.png
deleted file mode 100644
index fdead6c4a..000000000
--- a/theme/otalk/logo.png
+++ /dev/null
Binary files differ
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 4b30710fb..2814260bd 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -232,6 +232,17 @@ font-weight:bold;
address img + .fn {
display:none;
}
+address a {
+text-decoration:none;
+}
+address .poweredby {
+float:left;
+clear:left;
+display:block;
+position:relative;
+top:7px;
+margin-right:-47px;
+}
#header {
width:98.5%;
@@ -486,13 +497,59 @@ margin-bottom:7px;
margin-left:18px;
float:left;
}
-#form_notice .error {
+.form_notice .error,
+.form_notice .success {
float:left;
clear:both;
-width:96.9%;
+width:81.5%;
margin-bottom:0;
line-height:1.618;
}
+.form_notice #notice_data-attach_selected code {
+float:left;
+width:80%;
+display:block;
+overflow:auto;
+margin-right:2.5%;
+font-size:1.1em;
+}
+.form_notice #notice_data-attach_selected button.close {
+float:right;
+font-size:0.8em;
+}
+
+.form_notice #notice_data-geo_wrap label,
+.form_notice #notice_data-geo_wrap input {
+position:absolute;
+top:25px;
+right:4px;
+left:auto;
+cursor:pointer;
+width:16px;
+height:16px;
+display:block;
+}
+.form_notice #notice_data-geo_wrap input {
+visibility:hidden;
+}
+.form_notice #notice_data-geo_wrap label {
+font-weight:normal;
+font-size:1em;
+margin-bottom:0;
+text-indent:-9999px;
+}
+
+button.close,
+button.minimize {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+cursor:pointer;
+}
/* entity_profile */
.entity_profile {
@@ -850,6 +907,67 @@ font-size:1.025em;
.notice div.entry-content .timestamp {
display:inline-block;
}
+.entry-content .repeat {
+display:block;
+}
+.entry-content .repeat .photo {
+float:none;
+margin-right:1px;
+position:relative;
+top:4px;
+left:0;
+}
+
+.dialogbox {
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:9;
+float:none;
+padding:11px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-style:solid;
+border-width:1px;
+}
+
+.dialogbox legend {
+display:block !important;
+margin-right:18px;
+margin-bottom:18px;
+}
+
+.dialogbox button.close {
+position:absolute;
+right:3px;
+top:3px;
+}
+
+.dialogbox .form_guide {
+font-weight:normal;
+padding:0;
+}
+
+.dialogbox .submit_dialogbox {
+font-weight:bold;
+text-indent:0;
+min-width:46px;
+}
+.dialogbox input {
+padding-left:4px;
+}
+.dialogbox fieldset {
+margin-bottom:0;
+}
+
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
+cursor:wait;
+outline:none;
+text-indent:-9999px;
+}
.notice-options {
position:relative;
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 2b9174182..dfeb01b48 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -60,6 +60,36 @@ input.submit,
color:#FFFFFF;
}
+.dialogbox .submit_dialogbox,
+input.submit,
+.form_notice input.submit {
+background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
+text-shadow:0 1px 0 #FFFFFF;
+color:#000000;
+border-color:#AAAAAA;
+border-top-color:#CCCCCC;
+border-left-color:#CCCCCC;
+}
+.dialogbox .submit_dialogbox:hover,
+input.submit:hover {
+background-position:0 -5px;
+}
+.dialogbox .submit_dialogbox:focus,
+input.submit:focus {
+background-position:0 -15px;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
+text-shadow:none;
+}
+
+.form_notice label[for=notice_data-geo] {
+background-position:0 -1780px;
+}
+.form_notice label[for=notice_data-geo].checked {
+background-position:0 -1846px;
+}
+
a,
div.notice-options input,
.form_user_block input.submit,
@@ -158,16 +188,69 @@ color:#333333;
color:#000000;
}
#form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+background-position:0 -328px;
}
#form_notice #notice_data-attach {
opacity:0;
}
-#form_notice.processing #notice_action-submit {
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+.notice-options form.form_repeat input.submit,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.form_remote_authorize input.submit,
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit,
+.notice-options .repeated,
+.form_notice label[for=notice_data-geo],
+button.minimize,
+.form_reset_key input.submit,
+.entity_clear input.submit,
+.entity_flag input.submit,
+.entity_flag p,
+.entity_subscribe input.submit,
+#realtime_play,
+#realtime_pause,
+#realtime_popup {
+background-image:url(../../base/images/icons/icons-01.gif);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
+
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
+}
+.notice-options .form_repeat.processing {
+background-image:none;
}
#content,
@@ -190,6 +273,12 @@ color:#8F0000;
text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
}
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
+
.error {
background-color:#F7E8E8;
}
@@ -197,6 +286,14 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
+button.close {
+background-position:0 -1120px;
+}
+button.minimize {
+background-position:0 -1912px;
+}
+
+
#anon_notice {
color:#000000;
}
@@ -207,81 +304,138 @@ background-repeat:no-repeat;
background-position:0 45%;
}
#export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.png);
+background-position:0 -130px;
}
#export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.png);
+background-position:0 -64px;
}
#export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
+background-position:0 1px;
}
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-position: 0 40%;
-background-repeat: no-repeat;
-background-color:transparent;
+#export_data li a.rss {
+background-position:0 -130px;
+}
+#export_data li a.atom {
+background-position:0 -64px;
}
+#export_data li a.foaf {
+background-position:0 1px;
+}
+
.form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
.form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
+.form_user_unsubscribe input.submit,
+.form_remote_authorize input.submit,
+.entity_subscribe a {
background-color:#8F0000;
color:#FFFFFF;
}
-.form_user_unsubscribe input.submit,
.form_group_leave input.submit,
-.form_user_authorization input.reject {
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
background-color:#87B4C8;
}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.form_remote_authorize input.submit,
+.entity_subscribe a {
+background-position:5px -1181px;
+}
.entity_edit a {
-background-image:url(../../base/images/icons/twotone/green/edit.gif);
+background-position: 5px -719px;
}
.entity_send-a-message a {
-background-image:url(../../base/images/icons/twotone/green/quote.gif);
+background-position: 5px -852px;
}
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul,
+.dialogbox {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
.entity_nudge p,
.form_user_nudge input.submit {
-background-image:url(../../base/images/icons/twotone/green/mail.gif);
+background-position: 5px -785px;
}
.form_user_block input.submit,
.form_user_unblock input.submit,
.form_group_block input.submit,
.form_group_unblock input.submit {
-background-image:url(../../base/images/icons/twotone/green/shield.gif);
+background-position: 5px -918px;
}
.form_make_admin input.submit {
-background-image:url(../../base/images/icons/twotone/green/admin.gif);
+background-position: 5px -983px;
+}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
+.form_reset_key input.submit {
+background-position: 5px -1973px;
+}
+.entity_clear input.submit {
+background-position: 5px -2039px;
+}
+.entity_flag input.submit,
+.entity_flag p {
+background-position: 5px -2105px;
+}
+.entity_subscribe input.accept {
+background-position: 5px -2171px;
+}
+.entity_subscribe input.reject {
+background-position: 5px -2237px;
+}
+#realtime_play {
+background-position: 0 -2308px;
+}
+#realtime_pause {
+background-position: 0 -2374px;
+}
+#realtime_popup {
+background-position: 0 -1714px;
}
/* NOTICES */
.notice .attachment {
-background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+background-position:0 -394px;
}
#attachments .attachment {
background:none;
}
.notice-options .notice_reply {
-background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background-position:0 -592px;
}
.notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background-position:0 -460px;
}
.notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background-position:0 -526px;
}
.notice-options .notice_delete {
-background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background-position:0 -658px;
+}
+.notice-options form.form_repeat input.submit {
+background-position:0 -1582px;
+}
+.notice-options .repeated {
+background-position:0 -1648px;
}
+
.notices div.entry-content,
.notices div.notice-options {
opacity:0.4;
@@ -319,19 +473,26 @@ background-color:rgba(200, 200, 200, 0.300);
/*END: NOTICES */
#new_group a {
-background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background-position:0 -1054px;
}
-.pagination .nav_prev a,
-.pagination .nav_next a {
-background-repeat:no-repeat;
-border-color:#000000;
-}
.pagination .nav_prev a {
-background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
+background-position:10% -187px;
}
.pagination .nav_next a {
-background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
+background-position:105% -252px;
+}
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
+}
+
diff --git a/theme/pigeonthoughts/logo.png b/theme/pigeonthoughts/logo.png
index 550d373fe..cf1839194 100644
--- a/theme/pigeonthoughts/logo.png
+++ b/theme/pigeonthoughts/logo.png
Binary files differ