[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit kdevelop4-plugins for openSUSE:Factory
From: root () hilbert ! suse ! de (h_root)
Date: 2011-01-25 12:09:21
Message-ID: 20110125120921.74E40202AE () hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package kdevelop4-plugins for openSUSE:Factory
checked in at Tue Jan 25 13:09:21 CET 2011.
--------
--- KDE/kdevelop4-plugins/kdevelop4-plugins.changes 2011-01-15 17:23:10.000000000 \
+0100
+++ /mounts/work_src_done/STABLE/kdevelop4-plugins/kdevelop4-plugins.changes 2011-01-24 \
16:49:22.000000000 +0100 @@ -1,0 +2,6 @@
+Mon Jan 24 15:24:22 UTC 2011 - wstephenson@novell.com
+
+- Update to 1.2.0 release
+ * Use rainbow colors for all PHP variables
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdevelop-php-1.1.90.tar.bz2
kdevelop-php-docs-1.1.90.tar.bz2
New:
----
kdevelop-php-1.2.0.tar.bz2
kdevelop-php-docs-1.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevelop4-plugins.spec ++++++
--- /var/tmp/diff_new_pack.WdefTk/_old 2011-01-25 13:09:06.000000000 +0100
+++ /var/tmp/diff_new_pack.WdefTk/_new 2011-01-25 13:09:06.000000000 +0100
@@ -24,7 +24,7 @@
Group: Development/Tools/IDE
Summary: Additional plugins for Kdevelop4 Integrated Development Environment
Url: http://www.kdevelop.org
-Version: 1.1.90
+Version: 1.2.0
Release: 1
Source0: kdevelop-php-%version.tar.bz2
Source1: kdevelop-php-docs-%version.tar.bz2
++++++ add-php-docs.diff ++++++
--- /var/tmp/diff_new_pack.WdefTk/_old 2011-01-25 13:09:06.000000000 +0100
+++ /var/tmp/diff_new_pack.WdefTk/_new 2011-01-25 13:09:06.000000000 +0100
@@ -4,7 +4,7 @@
add_subdirectory(parser)
add_subdirectory(duchain)
add_subdirectory(completion)
-+add_subdirectory(kdevelop-php-docs-1.1.90)
++add_subdirectory(kdevelop-php-docs-1.2.0)
set(kdevphplanguagesupport_PART_SRCS
phplanguagesupport.cpp
++++++ kdevelop-php-1.1.90.tar.bz2 -> kdevelop-php-1.2.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/CHANGELOG.1.1.90 \
new/kdevelop-php-1.2.0/CHANGELOG.1.1.90
--- old/kdevelop-php-1.1.90/CHANGELOG.1.1.90 2011-01-09 22:52:33.000000000 +0100
+++ new/kdevelop-php-1.2.0/CHANGELOG.1.1.90 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-ChangeLog for php v1.1.90
-=========================
-
-* Milian Wolff: push version to 1.1.90 in preparation of 4.2 rc1 release
-* Milian Wolff: Allow null as type for class constants.
-* Milian Wolff: set version to 1.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/CHANGELOG.1.2.0 \
new/kdevelop-php-1.2.0/CHANGELOG.1.2.0
--- old/kdevelop-php-1.1.90/CHANGELOG.1.2.0 1970-01-01 01:00:00.000000000 +0100
+++ new/kdevelop-php-1.2.0/CHANGELOG.1.2.0 2011-01-23 20:42:54.000000000 +0100
@@ -0,0 +1,11 @@
+ChangeLog for php v1.2.0
+========================
+
+* Milian Wolff: set version to 1.2.0 and look for same versioned kdevplatform in \
preparation of release +* Milian Wolff: fix test logic
+* Milian Wolff: only take encountered declarations into account when checking for \
redeclarations +* Milian Wolff: don't report use for same range as declaration of \
parent-namespace, happens with nested namespaces, fixes test +* Milian Wolff: \
properly pass topducontext to update along +* Milian Wolff: force updated range when \
encountering variable declaration +* Milian Wolff: prevent explicitlyGlobal import \
identifiers for namespace alias declaration, fixes assert +* Milian Wolff: prevent \
crash in ExpressionVisitor::visitEncapsVar when class is currentClass and hence \
internalContext is not yet set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/CMakeLists.txt \
new/kdevelop-php-1.2.0/CMakeLists.txt
--- old/kdevelop-php-1.1.90/CMakeLists.txt 2011-01-09 22:58:58.000000000 +0100
+++ new/kdevelop-php-1.2.0/CMakeLists.txt 2011-01-23 20:49:32.000000000 +0100
@@ -9,7 +9,7 @@
#complain about the FindKDevelop-PG.cmake file not findable.
find_package(KDE4 REQUIRED)
-find_package(KDevPlatform 1.1.90 REQUIRED)
+find_package(KDevPlatform 1.2.0 REQUIRED)
include_directories(${KDEVPLATFORM_INCLUDE_DIR})
include_directories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' \
old/kdevelop-php-1.1.90/duchain/builders/declarationbuilder.cpp \
new/kdevelop-php-1.2.0/duchain/builders/declarationbuilder.cpp
--- old/kdevelop-php-1.1.90/duchain/builders/declarationbuilder.cpp 2011-01-09 \
22:52:33.000000000 +0100
+++ new/kdevelop-php-1.2.0/duchain/builders/declarationbuilder.cpp 2011-01-23 \
20:42:54.000000000 +0100 @@ -225,7 +225,7 @@
{
if (dec->isFunctionDeclaration()) {
ClassMethodDeclaration* func = \
dynamic_cast<ClassMethodDeclaration*>(dec);
- if (!func) {
+ if (!func || !wasEncountered(func)) {
continue;
}
// we cannot redeclare final classes ever
@@ -264,7 +264,7 @@
DUChainWriteLocker lock(DUChain::lock());
foreach(Declaration * dec, \
currentContext()->findLocalDeclarations(ids.second.first(), \
startPos(node->methodName))) {
- if (dec->isFunctionDeclaration()) {
+ if (wasEncountered(dec) && dec->isFunctionDeclaration()) {
reportRedeclarationError(dec, node->methodName);
localError = true;
break;
@@ -383,7 +383,7 @@
Q_ASSERT(currentContext()->type() == DUContext::Class);
foreach(Declaration * dec, \
currentContext()->findLocalDeclarations(name.first(), startPos(node))) {
- if (!dec->isFunctionDeclaration() && ! dec->abstractType()->modifiers() \
& AbstractType::ConstModifier) { + if (wasEncountered(dec) && \
!dec->isFunctionDeclaration() && ! dec->abstractType()->modifiers() & \
AbstractType::ConstModifier) { reportRedeclarationError(dec, node);
break;
}
@@ -484,7 +484,7 @@
DUChainWriteLocker lock(DUChain::lock());
foreach(Declaration * dec, \
currentContext()->findLocalDeclarations(identifierForNode(node->identifier).first(), \
startPos(node->identifier))) {
- if (!dec->isFunctionDeclaration() && dec->abstractType()->modifiers() & \
AbstractType::ConstModifier) { + if (wasEncountered(dec) && \
!dec->isFunctionDeclaration() && dec->abstractType()->modifiers() & \
AbstractType::ConstModifier) { reportRedeclarationError(dec, node->identifier);
break;
}
@@ -624,7 +624,7 @@
DUChainWriteLocker lock(DUChain::lock());
QList<Declaration*> declarations = \
currentContext()->topContext()->findDeclarations( identifier, startPos(node) ); \
foreach(Declaration* dec, declarations) {
- if (isMatch(dec, type)) {
+ if (wasEncountered(dec) && isMatch(dec, type)) {
reportRedeclarationError(dec, node);
return true;
}
@@ -710,6 +710,9 @@
}
DUChainWriteLocker lock(DUChain::lock());
+
+ const RangeInRevision newRange = editorFindRange(node, node);
+
// check if this variable is already declared
{
QList< Declaration* > decs = parentCtx->findDeclarations(identifier.first(), \
startPos(node), 0, DUContext::DontSearchInParent); @@ -718,7 +721,12 @@
while ( true ) {
// we expect that the list of declarations has the newest \
declaration at back if ( dynamic_cast<VariableDeclaration*>( *it ) ) {
- encounter(*it);
+ if (!wasEncountered(*it)) {
+ encounter(*it);
+ // force new range \
https://bugs.kde.org/show_bug.cgi?id=262189, + // might be \
wrong when we had syntax errors in there before + \
(*it)->setRange(newRange); + }
if ( (*it)->abstractType() && \
!(*it)->abstractType()->equals(type.unsafeData()) ) {
// if it's currently mixed and we now get something more \
definite, use that instead
if ( ReferenceType::Ptr rType = \
ReferenceType::Ptr::dynamicCast((*it)->abstractType()) ) { @@ -772,8 +780,6 @@
}
}
- RangeInRevision newRange = editorFindRange(node, node);
-
VariableDeclaration *dec = openDefinition<VariableDeclaration>(identifier, \
newRange); dec->setKind(Declaration::Instance);
if (!m_lastTopStatementComment.isEmpty()) {
@@ -783,7 +789,7 @@
}
}
//own closeDeclaration() that doesn't use lastType()
- currentDeclaration()->setType(type);
+ dec->setType(type);
eventuallyAssignInternalContext();
DeclarationBuilderBase::closeDeclaration();
}
@@ -1158,7 +1164,10 @@
\
m_editor->findRange(idNode)); {
///TODO: case insensitive!
- decl->setImportIdentifier( identifierForNamespace(node->identifier, \
m_editor) ); + QualifiedIdentifier qid = \
identifierForNamespace(node->identifier, m_editor); + ///TODO: find out why \
this must be done (see mail to kdevelop-devel on jan 18th 2011) + \
qid.setExplicitlyGlobal( false ); + decl->setImportIdentifier( qid );
decl->setPrettyName( id.first );
decl->setKind(Declaration::NamespaceAlias);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/builders/usebuilder.cpp \
new/kdevelop-php-1.2.0/duchain/builders/usebuilder.cpp
--- old/kdevelop-php-1.1.90/duchain/builders/usebuilder.cpp 2011-01-09 \
22:52:33.000000000 +0100
+++ new/kdevelop-php-1.2.0/duchain/builders/usebuilder.cpp 2011-01-23 \
20:42:54.000000000 +0100 @@ -176,7 +176,9 @@
curId.push(identifier.at(i));
AstNode* n = node->namespaceNameSequence->at(i)->element;
DeclarationPointer dec = findDeclarationImport(NamespaceDeclarationType, \
curId, n);
- newCheckedUse(n, dec);
+ if (!dec || dec->range() != editorFindRange(n, n)) {
+ newCheckedUse(n, dec);
+ }
}
newCheckedUse(node->namespaceNameSequence->back()->element,
findDeclarationImport(lastType, identifier, node ));
@@ -186,7 +188,10 @@
const IdentifierPair& identifier, const \
RangeInRevision& range) {
if (node != parent->namespaceNameSequence->back()->element) {
- newCheckedUse(node, findDeclarationImport(NamespaceDeclarationType, \
identifier.second, node)); + DeclarationPointer dec = \
findDeclarationImport(NamespaceDeclarationType, identifier.second, node); + if \
(!dec || dec->range() != editorFindRange(node, node)) { + \
newCheckedUse(node, dec); + }
}
UseBuilderBase::openNamespace(parent, node, identifier, range);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/expressionvisitor.cpp \
new/kdevelop-php-1.2.0/duchain/expressionvisitor.cpp
--- old/kdevelop-php-1.1.90/duchain/expressionvisitor.cpp 2011-01-09 \
22:52:33.000000000 +0100
+++ new/kdevelop-php-1.2.0/duchain/expressionvisitor.cpp 2011-01-23 \
20:42:54.000000000 +0100 @@ -483,10 +483,20 @@
DUChainReadLocker lock(DUChain::lock());
if ( StructureType::Ptr structType = dec->type<StructureType>() ) {
if ( ClassDeclaration* cdec = \
dynamic_cast<ClassDeclaration*>(structType->declaration(m_currentContext->topContext())) \
) {
- foreach( Declaration* pdec, \
cdec->internalContext()->findDeclarations(identifierForNode(node->propertyIdentifier)) \
) {
- if ( !pdec->isFunctionDeclaration() ) {
- foundDec = pdec;
- break;
+ ///TODO: share code with visitVariableProperty
+ DUContext* ctx = cdec->internalContext();
+ if (!ctx && m_currentContext->parentContext()) {
+ if \
(m_currentContext->parentContext()->localScopeIdentifier() == \
cdec->qualifiedIdentifier()) { + //class is currentClass \
(internalContext is not yet set) + ctx = \
m_currentContext->parentContext(); + }
+ }
+ if (ctx) {
+ foreach( Declaration* pdec, \
ctx->findDeclarations(identifierForNode(node->propertyIdentifier)) ) { + \
if ( !pdec->isFunctionDeclaration() ) { + foundDec = \
pdec; + break;
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/tests/duchain.cpp \
new/kdevelop-php-1.2.0/duchain/tests/duchain.cpp
--- old/kdevelop-php-1.1.90/duchain/tests/duchain.cpp 2011-01-09 22:52:33.000000000 \
+0100
+++ new/kdevelop-php-1.2.0/duchain/tests/duchain.cpp 2011-01-23 20:42:54.000000000 \
+0100 @@ -2405,13 +2405,14 @@
"}\n"
"namespace {\n"
"use ns1\\ns2, ns3\\ns4 as ns5;\n"
+ "use \\ns3\\ns4 as ns6;\n"
"}\n"
, DumpNone);
QVERIFY(top);
DUChainReleaser releaseTop(top);
DUChainWriteLocker lock;
- QCOMPARE(top->localDeclarations().count(), 4);
+ QCOMPARE(top->localDeclarations().count(), 5);
Declaration* dec = top->localDeclarations().at(2);
QCOMPARE(dec->qualifiedIdentifier().toString(), QString("ns2"));
@@ -2420,6 +2421,12 @@
dec = top->localDeclarations().at(3);
QCOMPARE(dec->qualifiedIdentifier().toString(), QString("ns5"));
QVERIFY(dynamic_cast<NamespaceAliasDeclaration*>(dec));
+
+ dec = top->localDeclarations().at(4);
+ QCOMPARE(dec->qualifiedIdentifier().toString(), QString("ns6"));
+ QVERIFY(dynamic_cast<NamespaceAliasDeclaration*>(dec));
+ ///TODO: find out why this is explictly required
+ QVERIFY(!dynamic_cast<NamespaceAliasDeclaration*>(dec)->importIdentifier().explicitlyGlobal());
}
struct TestUse {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/tests/uses.cpp \
new/kdevelop-php-1.2.0/duchain/tests/uses.cpp
--- old/kdevelop-php-1.1.90/duchain/tests/uses.cpp 2011-01-09 22:52:33.000000000 \
+0100
+++ new/kdevelop-php-1.2.0/duchain/tests/uses.cpp 2011-01-23 20:42:54.000000000 +0100
@@ -879,7 +879,6 @@
dec = top->findDeclarations(QualifiedIdentifier("foo")).last();
QCOMPARE(dec->kind(), Declaration::Namespace);
compareUses(dec, QList<RangeInRevision>()
- << RangeInRevision(1, 10, 1, 13)
<< RangeInRevision(8, 1, 8, 4)
<< RangeInRevision(9, 1, 9, 4)
<< RangeInRevision(10, 1, 10, 4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/kdevphpsupport.desktop \
new/kdevelop-php-1.2.0/kdevphpsupport.desktop
--- old/kdevelop-php-1.1.90/kdevphpsupport.desktop 2011-01-09 22:52:33.000000000 \
+0100
+++ new/kdevelop-php-1.2.0/kdevphpsupport.desktop 2011-01-23 20:42:54.000000000 +0100
@@ -30,9 +30,13 @@
Name[en_GB]=PHP Language Support
Name[es]=Implementación de lenguaje PHP
Name[et]=PHP keele toetus
+Name[fr]=Prise en charge du langage PHP
+Name[it]=Supporto al linguaggio PHP
+Name[nb]=PHP språkstøtte
Name[nl]=Ondersteuning voor PHP-taal
Name[pt]=Suporte Linguagem PHP
Name[pt_BR]=Suporte linguagem PHP
+Name[ru]=Поддержка языка PHP
Name[sv]=Stöd för språket PHP
Name[uk]=Підтримка мови PHP
Name[x-test]=xxPHP Language Supportxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/phplanguagesupport.cpp \
new/kdevelop-php-1.2.0/phplanguagesupport.cpp
--- old/kdevelop-php-1.1.90/phplanguagesupport.cpp 2011-01-09 22:52:33.000000000 \
+0100
+++ new/kdevelop-php-1.2.0/phplanguagesupport.cpp 2011-01-23 20:42:54.000000000 +0100
@@ -57,7 +57,7 @@
using namespace KDevelop;
K_PLUGIN_FACTORY(KDevPhpSupportFactory, registerPlugin<Php::LanguageSupport>();)
-K_EXPORT_PLUGIN(KDevPhpSupportFactory(KAboutData("kdevphpsupport","kdevphp", \
ki18n("Php Support"), "1.1.90", ki18n("Support for Php Language"), \
KAboutData::License_GPL) \
+K_EXPORT_PLUGIN(KDevPhpSupportFactory(KAboutData("kdevphpsupport","kdevphp", \
ki18n("Php Support"), "1.2.0", ki18n("Support for Php Language"), \
KAboutData::License_GPL)
.addAuthor(ki18n("Milian Wolff"), ki18n("Author"), "mail@milianw.de", \
"http://milianw.de")
.addAuthor(ki18n("Niko Sams"), ki18n("Author"), "niko.sams@gmail.com", \
"http://nikosams.blogspot.com") ))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/phpparsejob.cpp \
new/kdevelop-php-1.2.0/phpparsejob.cpp
--- old/kdevelop-php-1.1.90/phpparsejob.cpp 2011-01-09 22:52:33.000000000 +0100
+++ new/kdevelop-php-1.2.0/phpparsejob.cpp 2011-01-23 20:42:54.000000000 +0100
@@ -148,7 +148,7 @@
QReadLocker parseLock(php()->language()->parseLock());
DeclarationBuilder builder(&editor);
- KDevelop::ReferencedTopDUContext chain = builder.build(document(), ast);
+ KDevelop::ReferencedTopDUContext chain = builder.build(document(), ast, \
toUpdate);
if (abortRequested()) {
return abortJob();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/po/CMakeLists.txt \
new/kdevelop-php-1.2.0/po/CMakeLists.txt
--- old/kdevelop-php-1.1.90/po/CMakeLists.txt 2011-01-09 22:58:58.000000000 +0100
+++ new/kdevelop-php-1.2.0/po/CMakeLists.txt 2011-01-23 20:49:32.000000000 +0100
@@ -11,6 +11,7 @@
add_subdirectory(th)
add_subdirectory(ca)
add_subdirectory(uk)
+add_subdirectory(nb)
add_subdirectory(da)
add_subdirectory(nds)
add_subdirectory(sv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/po/nb/CMakeLists.txt \
new/kdevelop-php-1.2.0/po/nb/CMakeLists.txt
--- old/kdevelop-php-1.1.90/po/nb/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/kdevelop-php-1.2.0/po/nb/CMakeLists.txt 2011-01-23 20:46:58.000000000 +0100
@@ -0,0 +1,2 @@
+file(GLOB _po_files *.po)
+GETTEXT_PROCESS_PO_FILES(nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} \
${_po_files} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-1.1.90/po/nb/kdevphp.po \
new/kdevelop-php-1.2.0/po/nb/kdevphp.po
--- old/kdevelop-php-1.1.90/po/nb/kdevphp.po 1970-01-01 01:00:00.000000000 +0100
+++ new/kdevelop-php-1.2.0/po/nb/kdevphp.po 2011-01-23 20:46:58.000000000 +0100
@@ -0,0 +1,219 @@
+# Translation of kdevphp to Norwegian Bokmål
+#
+# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2011-01-06 02:37+0100\n"
+"PO-Revision-Date: 2010-12-31 14:54+0100\n"
+"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: completion/implementationitem.cpp:69
+msgid "Override"
+msgstr "Overstyr"
+
+#: completion/implementationitem.cpp:72
+msgid "Implement"
+msgstr "Implementer"
+
+#: completion/implementationitem.cpp:84
+#, kde-format
+msgid "From %1"
+msgstr "Fra %1"
+
+#: duchain/builders/contextbuilder.cpp:388
+#, kde-format
+msgid "Circular inheritance of %1 and %2"
+msgstr "Sirkulær arv av %1 og %2"
+
+#: duchain/builders/usebuilder.cpp:143
+#, kde-format
+msgid "Usage of %1 is deprecated."
+msgstr "Bruk av %1 er frarådet."
+
+#: duchain/builders/declarationbuilder.cpp:300
+#, kde-format
+msgid "Access type for interface method %1 must be omitted."
+msgstr "Tilgangstype for grensesnittmetode %1 må utelates."
+
+#: duchain/builders/declarationbuilder.cpp:304
+#, kde-format
+msgid "Interface function %1 cannot contain body."
+msgstr "Grensesnittfunksjon %1 kan ikke inneholde en kropp."
+
+#: duchain/builders/declarationbuilder.cpp:316
+#, kde-format
+msgid ""
+"Class %1 contains abstract method %2 and must therefore be declared abstract "
+"or implement the method."
+msgstr ""
+"Klasse %1 inneholder en abstrakt metode %2 og må derfor deklareres abstrakt, "
+"eller implementere metoden."
+
+#: duchain/builders/declarationbuilder.cpp:322
+#, kde-format
+msgid "Abstract function %1 cannot contain body."
+msgstr "Abstrakt funksjon %1 kan ikke inneholde en kropp."
+
+#: duchain/builders/declarationbuilder.cpp:325
+msgid "Cannot use the final modifier on an abstract class member."
+msgstr "Kan ikke bruke final på et abstrakt klassemedlem."
+
+#: duchain/builders/declarationbuilder.cpp:335
+#, kde-format
+msgid "Non-abstract method %1 must contain body."
+msgstr "Ikke-abstrakt metode %1 må inneholde en kropp."
+
+#: duchain/builders/declarationbuilder.cpp:349
+msgid "Properties cannot be declared final."
+msgstr "Egenskaper kan ikke deklareres final."
+
+#: duchain/builders/declarationbuilder.cpp:352
+msgid "Properties cannot be declared abstract."
+msgstr "Egenskaper kan ikke deklareres abstrakt."
+
+#: duchain/builders/declarationbuilder.cpp:451
+#, kde-format
+msgid "Cannot redeclare private property %1 from this context."
+msgstr "Kan ikke redeklarere private egenskap %1 fra denne konteksten."
+
+#: duchain/builders/declarationbuilder.cpp:457
+#, kde-format
+msgid "Cannot redeclare protected property %1 from this context."
+msgstr "Kan ikke redeklarere protected egenskap %1 fra denne konteksten."
+
+#: duchain/builders/declarationbuilder.cpp:520
+msgid ""
+"Only booleans, ints, floats and strings are allowed for class constants."
+msgstr "Bare boolean, int, float og string er tillatt for klassekonstanter."
+
+#: duchain/builders/declarationbuilder.cpp:533
+msgid "Default value for parameters with a class type hint can only be NULL."
+msgstr "Standardverdi for parametre med et klassetype-hint kan bare være NULL."
+
+#: duchain/builders/declarationbuilder.cpp:536
+msgid "Following parameters must have a default value assigned."
+msgstr "Følgende parametre må ha tilordnet en standardverdi."
+
+#: duchain/builders/declarationbuilder.cpp:642
+#, kde-format
+msgid "Cannot redeclare PHP internal %1."
+msgstr "Kan ikke re-deklarere PHP intern %1."
+
+#: duchain/builders/declarationbuilder.cpp:646
+#, kde-format
+msgid "Cannot redeclare %1, already declared in %2 on line %3."
+msgstr "Kan ikke re-deklarere %1, allerede deklarert i %2 på linje %3."
+
+#: duchain/builders/declarationbuilder.cpp:708
+msgid "Cannot re-assign $this."
+msgstr "Kan ikke gi $this ny tilordning."
+
+#: duchain/builders/declarationbuilder.cpp:1149
+#, kde-format
+msgid "The use statement with non-compound name '%1' has no effect."
+msgstr "use-setningen med ikke-sammensatt navn %1 har ingen effekt."
+
+#: duchain/navigation/declarationnavigationcontext.cpp:123
+msgid "PHP internal"
+msgstr "PHP intern"
+
+#: duchain/navigation/declarationnavigationcontext.cpp:133
+msgctxt "kind of a php-constant, as shown in the declaration tooltip"
+msgid "Constant"
+msgstr "Konstant"
+
+#: duchain/navigation/magicconstantnavigationcontext.cpp:61
+msgid "magic constant"
+msgstr "magisk konstant"
+
+#: duchain/navigation/magicconstantnavigationcontext.cpp:76
+msgid "empty (not inside a class)"
+msgstr "tom (ikke inne i en klasse)"
+
+#: duchain/navigation/magicconstantnavigationcontext.cpp:95
+msgid "empty (not inside a method)"
+msgstr "tom (ikke inne i en metode)"
+
+#: duchain/navigation/magicconstantnavigationcontext.cpp:105
+msgid "empty (not inside a function)"
+msgstr "tom (ikke inne i en funksjon)"
+
+#: duchain/navigation/magicconstantnavigationcontext.cpp:114
+msgid "empty (not inside a namespace)"
+msgstr "tom (ikke inne i et navnerom)"
+
+#: duchain/navigation/magicconstantnavigationcontext.cpp:118
+#, kde-format
+msgid "current value: %1"
+msgstr "nåværende verdi: %1"
+
+#: parser/main.cpp:41
+msgid "php-parser"
+msgstr "pgp-tolker"
+
+#: parser/main.cpp:42
+msgid "KDevelop PHP parser debugging utility"
+msgstr "KDevelop-verktøy for å feilsøke PHP-tolker"
+
+#: parser/main.cpp:43
+msgid "(c) 2008 Niko Sams, 2009 Milian Wolff"
+msgstr " 2008 Niko Sams, 2009 Milian Wolff"
+
+#: parser/parsesession.cpp:71
+#, kde-format
+msgid "Could not open file '%1'"
+msgstr "Klarte ikke å åpne fila %1 "
+
+#: parser/parsesession.cpp:74
+msgid "File could not be read from."
+msgstr "Klarte ikke å lese fila."
+
+#: parser/parsesession.cpp:77
+msgid "File could not be opened."
+msgstr "Fila kunne ikke åpnes."
+
+#: parser/parsesession.cpp:80
+msgid "File permissions prevent opening for read."
+msgstr "Filtillatelser tillater ikke åpning for lesing."
+
+#: phplanguagesupport.cpp:60
+msgid "Php Support"
+msgstr "PHP-støtte"
+
+#: phplanguagesupport.cpp:60
+msgid "Support for Php Language"
+msgstr "Støtte for PHP-språket"
+
+#: phplanguagesupport.cpp:61
+msgid "Milian Wolff"
+msgstr "Milian Wolff"
+
+#: phplanguagesupport.cpp:61 phplanguagesupport.cpp:62
+msgid "Author"
+msgstr "Forfatter"
+
+#: phplanguagesupport.cpp:62
+msgid "Niko Sams"
+msgstr "Niko Sams"
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Bjørn Steensrud"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "bjornst@skogkatt.homelinux.org"
\ No newline at end of file
++++++ kdevelop-php-docs-1.1.90.tar.bz2 -> kdevelop-php-docs-1.2.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/CHANGELOG.1.1.90 \
new/kdevelop-php-docs-1.2.0/CHANGELOG.1.1.90
--- old/kdevelop-php-docs-1.1.90/CHANGELOG.1.1.90 2011-01-09 22:59:00.000000000 +0100
+++ new/kdevelop-php-docs-1.2.0/CHANGELOG.1.1.90 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-ChangeLog for php-docs v1.1.90
-==============================
-
-* Milian Wolff: set version to 1.1.90 in preparation of kdev 4.2 rc1 release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/CHANGELOG.1.2.0 \
new/kdevelop-php-docs-1.2.0/CHANGELOG.1.2.0
--- old/kdevelop-php-docs-1.1.90/CHANGELOG.1.2.0 1970-01-01 01:00:00.000000000 +0100
+++ new/kdevelop-php-docs-1.2.0/CHANGELOG.1.2.0 2011-01-23 20:49:34.000000000 +0100
@@ -0,0 +1,4 @@
+ChangeLog for php-docs v1.2.0
+=============================
+
+* Milian Wolff: set version to 1.2.0 and look for same versioned kdevplatform in \
preparation of release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/CMakeLists.txt \
new/kdevelop-php-docs-1.2.0/CMakeLists.txt
--- old/kdevelop-php-docs-1.1.90/CMakeLists.txt 2011-01-09 23:05:22.000000000 +0100
+++ new/kdevelop-php-docs-1.2.0/CMakeLists.txt 2011-01-23 20:56:00.000000000 +0100
@@ -4,7 +4,7 @@
enable_testing()
find_package(KDE4 REQUIRED)
-find_package(KDevPlatform 1.1.90 REQUIRED)
+find_package(KDevPlatform 1.2.0 REQUIRED)
include_directories(${KDEVPLATFORM_INCLUDE_DIR})
include_directories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/kdevphpdocs.desktop \
new/kdevelop-php-docs-1.2.0/kdevphpdocs.desktop
--- old/kdevelop-php-docs-1.1.90/kdevphpdocs.desktop 2011-01-09 22:59:00.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/kdevphpdocs.desktop 2011-01-23 20:49:34.000000000 \
+0100 @@ -15,6 +15,7 @@
Comment[nl]=Deze plugin integreert PHP.net online-documentatie.
Comment[pt]=Este 'plugin' integra a documentação 'online' do PHP.net.
Comment[pt_BR]=Este plug-in integra a documentação on-line do PHP.net.
+Comment[ru]= асширение для работы с документацией \
с сайта PHP.net Comment[sv]=Insticksprogrammet integrerar PHP.net \
nätdokumentation. Comment[tr]=Bu eklenti, PHP çevrimiçi belgelendirmesini entegre \
eder. Comment[uk]=За допомогою цього додатка можна \
інтегрувати документацію PHP.net. @@ -37,6 +38,7 @@
Name[nl]=PHP-documentatie
Name[pt]=Documentação de PHP
Name[pt_BR]=Documentação de PHP
+Name[ru]=Документация по PHP
Name[sv]=PHP-dokumentation
Name[tr]=PHP Belgelendirmesi
Name[uk]=Документація з PHP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/kdevphpdocs_config.desktop \
new/kdevelop-php-docs-1.2.0/kdevphpdocs_config.desktop
--- old/kdevelop-php-docs-1.1.90/kdevphpdocs_config.desktop 2011-01-09 \
22:59:00.000000000 +0100
+++ new/kdevelop-php-docs-1.2.0/kdevphpdocs_config.desktop 2011-01-23 \
20:49:34.000000000 +0100 @@ -26,6 +26,7 @@
Name[nl]=PHP-documentatie
Name[pt]=Documentação de PHP
Name[pt_BR]=Documentação de PHP
+Name[ru]=Документация по PHP
Name[sv]=PHP-dokumentation
Name[tr]=PHP Belgelendirmesi
Name[uk]=Документація з PHP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/phpdocsplugin.cpp \
new/kdevelop-php-docs-1.2.0/phpdocsplugin.cpp
--- old/kdevelop-php-docs-1.1.90/phpdocsplugin.cpp 2011-01-09 22:59:00.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/phpdocsplugin.cpp 2011-01-23 20:49:34.000000000 +0100
@@ -52,7 +52,7 @@
K_PLUGIN_FACTORY(PhpDocsFactory, registerPlugin<PhpDocsPlugin>(); )
K_EXPORT_PLUGIN(PhpDocsFactory(KAboutData("kdevphpdocs","kdevphpdocs", \
ki18n("PhpDocs"),
- "1.1.90", ki18n("Check PHP.net \
documentation"), + "1.2.0", ki18n("Check \
PHP.net documentation"),
KAboutData::License_GPL).addAuthor(ki18n("Milian \
Wolff"),
ki18n("Maintainer"), "mail@milianw.de", \
"http://milianw.de")))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/CMakeLists.txt \
new/kdevelop-php-docs-1.2.0/po/CMakeLists.txt
--- old/kdevelop-php-docs-1.1.90/po/CMakeLists.txt 2011-01-09 23:05:22.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/po/CMakeLists.txt 2011-01-23 20:56:00.000000000 +0100
@@ -10,7 +10,9 @@
add_subdirectory(ca@valencia)
add_subdirectory(pt)
add_subdirectory(ca)
+add_subdirectory(ru)
add_subdirectory(uk)
+add_subdirectory(nb)
add_subdirectory(da)
add_subdirectory(nds)
add_subdirectory(sv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/nb/CMakeLists.txt \
new/kdevelop-php-docs-1.2.0/po/nb/CMakeLists.txt
--- old/kdevelop-php-docs-1.1.90/po/nb/CMakeLists.txt 1970-01-01 01:00:00.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/po/nb/CMakeLists.txt 2011-01-23 20:53:20.000000000 \
+0100 @@ -0,0 +1,2 @@
+file(GLOB _po_files *.po)
+GETTEXT_PROCESS_PO_FILES(nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} \
${_po_files} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/nb/kdevphpdocs.po \
new/kdevelop-php-docs-1.2.0/po/nb/kdevphpdocs.po
--- old/kdevelop-php-docs-1.1.90/po/nb/kdevphpdocs.po 1970-01-01 01:00:00.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/po/nb/kdevphpdocs.po 2011-01-23 20:53:20.000000000 \
+0100 @@ -0,0 +1,135 @@
+# Translation of kdevphpdocs to Norwegian Bokmål
+#
+# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2010-12-16 02:25+0100\n"
+"PO-Revision-Date: 2011-01-09 22:25+0100\n"
+"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: phpdocsmodel.cpp:113
+msgid "<lost declaration>"
+msgstr "<mistet deklarasjon>"
+
+#: phpdocumentationwidget.cpp:67
+msgid "...loading documentation..."
+msgstr "… laster dokumentasjon …"
+
+#: phpdocsplugin.cpp:54
+msgid "PhpDocs"
+msgstr "PhpDocs"
+
+#: phpdocsplugin.cpp:55
+msgid "Check PHP.net documentation"
+msgstr "Sjekk PHP.net-dokumentasjon"
+
+#: phpdocsplugin.cpp:56
+msgid "Milian Wolff"
+msgstr "Milian Wolff"
+
+#: phpdocsplugin.cpp:57
+msgid "Maintainer"
+msgstr "Vedlikeholder"
+
+#: phpdocsplugin.cpp:222
+msgid "PHP Documentation"
+msgstr "PHP-dokumentasjon"
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Bjørn Steensrud"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "bjornst@skogkatt.homelinux.org"
+
+#. i18n: file: phpdocsconfig.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc)
+#: rc.cpp:5
+msgid "PHP Manual Integration"
+msgstr "PHP håndbok-integrering"
+
+#. i18n: file: phpdocsconfig.ui:36
+#. i18n: ectx: property (text), widget (QLabel, PhpDocNote)
+#: rc.cpp:8
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+"css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">By default the online <a "
+"href=\"http://php.net\"><span style=\" text-decoration: underline; "
+"color:#0000ff;\">PHP documentation</span></a> is used remotely. "
+"Alternatively you can set the location to a local copy of the documentation "
+"in the language of your choice. Make sure you downloaded the <span style=\" "
+"font-style:italic;\">\"HTML format, many files\"</span> package.</p></body></"
+"html>"
+msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+"css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Som standard blir "
+"nettutgaven av <a href=\"http://php.net\"><span style=\" text-decoration: "
+"underline; color:#0000ff;\">PHP-dokumentasjonen</span></a> brukt. Ellers kan "
+"du oppgi adressen til en lokal utgave av dokumentasjonen på det språket du "
+"vil. Pass på at du lastet ned pakka <span style=\" font-style:italic;"
+"\">\"HTML format, mange filer\"</span> package.</p></body></html>"
+
+#. i18n: file: phpdocsconfig.ui:54
+#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel)
+#: rc.cpp:15
+msgid "Location:"
+msgstr "Plassering:"
+
+#. i18n: file: phpdocssettings.kcfg:10
+#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation)
+#: rc.cpp:18
+msgid "Specifies the location of the PHP documentation to use."
+msgstr "Oppgir plasseringen til den PHP-dokumentasjonen som skal brukes."
+
+#. i18n: file: phpdocssettings.kcfg:13
+#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation)
+#: rc.cpp:21
+msgid ""
+"The location of the PHP documentation to use. You can either use a remote\n"
+" location like http://php.net or a local directory which "
+"contains the\n"
+" PHP documentation in HTML format with many files."
+msgstr ""
+"Plasseringen til PHP-dokumentasjonen som skal brukes. Du kan enten bruke\n"
+" en nettadresse som http://php.net eller en lokal mappe som "
+"inneholder\n"
+" PHP-dokumentasjonen i HTML-format med mange filer."
+
+#. i18n: file: phpdocssettings.kcfg:15
+#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation)
+#: rc.cpp:26
+msgid ""
+"Make sure local copies are downloaded in HTML format with many files.\n"
+" "
+msgstr ""
+"Se til at lokale kopier er lastet ned i HTML-format med mange filer.\n"
+" "
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/ru/CMakeLists.txt \
new/kdevelop-php-docs-1.2.0/po/ru/CMakeLists.txt
--- old/kdevelop-php-docs-1.1.90/po/ru/CMakeLists.txt 1970-01-01 01:00:00.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/po/ru/CMakeLists.txt 2011-01-23 20:54:23.000000000 \
+0100 @@ -0,0 +1,2 @@
+file(GLOB _po_files *.po)
+GETTEXT_PROCESS_PO_FILES(ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} \
${_po_files} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/ru/kdevphpdocs.po \
new/kdevelop-php-docs-1.2.0/po/ru/kdevphpdocs.po
--- old/kdevelop-php-docs-1.1.90/po/ru/kdevphpdocs.po 1970-01-01 01:00:00.000000000 \
+0100
+++ new/kdevelop-php-docs-1.2.0/po/ru/kdevphpdocs.po 2011-01-23 20:54:23.000000000 \
+0100 @@ -0,0 +1,138 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Alexander Potashev <aspotashev@gmail.com>, 2010, 2011.
+# Alexander Wolf <alex.v.wolf@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2010-12-16 02:25+0100\n"
+"PO-Revision-Date: 2011-01-22 09:59+0300\n"
+"Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: phpdocsmodel.cpp:113
+msgid "<lost declaration>"
+msgstr ""
+
+#: phpdocumentationwidget.cpp:67
+msgid "...loading documentation..."
+msgstr "Загрузка документации..."
+
+#: phpdocsplugin.cpp:54
+msgid "PhpDocs"
+msgstr "PhpDocs"
+
+#: phpdocsplugin.cpp:55
+msgid "Check PHP.net documentation"
+msgstr "Просмотр документации на PHP.net"
+
+#: phpdocsplugin.cpp:56
+msgid "Milian Wolff"
+msgstr "Milian Wolff"
+
+#: phpdocsplugin.cpp:57
+msgid "Maintainer"
+msgstr "Сопровождающий"
+
+#: phpdocsplugin.cpp:222
+msgid "PHP Documentation"
+msgstr "Документация PHP"
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Александр Вольф"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "alex.v.wolf@gmail.com"
+
+#. i18n: file: phpdocsconfig.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc)
+#: rc.cpp:5
+msgid "PHP Manual Integration"
+msgstr "Интеграция руководства PHP"
+
+#. i18n: file: phpdocsconfig.ui:36
+#. i18n: ectx: property (text), widget (QLabel, PhpDocNote)
+#: rc.cpp:8
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">By default the online <a "
+"href=\"http://php.net\"><span style=\" text-decoration: underline; color:"
+"#0000ff;\">PHP documentation</span></a> is used remotely. Alternatively you "
+"can set the location to a local copy of the documentation in the language of "
+"your choice. Make sure you downloaded the <span style=\" font-style:italic;"
+"\">\"HTML format, many files\"</span> package.</p></body></html>"
+msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">По-умолчанию \
онлайновая <a " +"href=\"http://php.net\"><span style=\" text-decoration: \
underline; color:" +"#0000ff;\">документация на PHP</span></a> \
используется удалённо. В качестве " \
+"альтернативы можно сделать локальную копию \
документации и указать её " +"расположение. \
Убедитесь в том, что вы загрузили с сайта \
именно пакет <span " +"style=\" font-style:italic;\"> Формат HTML, \
много файлов </span>.</p></body></" +"html>"
+
+#. i18n: file: phpdocsconfig.ui:54
+#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel)
+#: rc.cpp:15
+msgid "Location:"
+msgstr " асположение:"
+
+#. i18n: file: phpdocssettings.kcfg:10
+#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation)
+#: rc.cpp:18
+msgid "Specifies the location of the PHP documentation to use."
+msgstr "Укажите расположение используемой \
документации PHP." +
+#. i18n: file: phpdocssettings.kcfg:13
+#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation)
+#: rc.cpp:21
+msgid ""
+"The location of the PHP documentation to use. You can either use a remote\n"
+" location like http://php.net or a local directory which "
+"contains the\n"
+" PHP documentation in HTML format with many files."
+msgstr ""
+" асположение используемой документации PHP. \
Можно указать адрес \n" +"вида http://php.net или \
локальную папку, в которой находится \
документация \n" +"PHP в виде набора HTML файлов."
+
+#. i18n: file: phpdocssettings.kcfg:15
+#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation)
+#: rc.cpp:26
+msgid ""
+"Make sure local copies are downloaded in HTML format with many files.\n"
+" "
+msgstr ""
+"Убедитесь в том, что документация загружена в \
виде архива с набором файлов " +"HTML.\n"
+" "
\ No newline at end of file
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic