[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: Re: kde-i18n-doc Digest, Vol 106, Issue 37
From: Georgi Shutov <gs () luxmedia ! bg>
Date: 2012-01-27 12:34:47
Message-ID: CAG9j9RAfytu2Xsw-5n9n2UxhhNyUhaKPBHQiz0Qqg8nNOsKbEQ () mail ! gmail ! com
[Download RAW message or body]
Hello,
I have birthday today :) Im turning 24, and I decide to make a big change
in my life with my new 3 servers :) I will join the conversantions soon
when I re-locate my mashines :)
Have a nice day 2 U all :)
2012/1/27 <kde-i18n-doc-request@kde.org>
> Send kde-i18n-doc mailing list submissions to
> kde-i18n-doc@kde.org
>
> To subscribe or unsubscribe via the World Wide Web, visit
> https://mail.kde.org/mailman/listinfo/kde-i18n-doc
> or, via email, send a message with subject or body 'help' to
> kde-i18n-doc-request@kde.org
>
> You can reach the person managing the list at
> kde-i18n-doc-owner@kde.org
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of kde-i18n-doc digest..."
>
>
> Today's Topics:
>
> 1. Is the branch information in kde_projects.xml used by the
> translation infrastructure? (Raphael Kubo da Costa)
> 2. Merging stable into master & i18n (Raphael Kubo da Costa)
> 3. [calligra] /: Variables: Made file-name work + enable access
> to file-name, keywords and comments. (Sebastian Sauer)
> 4. Re: Is the branch information in kde_projects.xml used by the
> translation infrastructure? (Albert Astals Cid)
> 5. Re: Merging stable into master & i18n (Albert Astals Cid)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Thu, 26 Jan 2012 22:25:23 -0200
> From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
> To: kde-i18n-doc@kde.org
> Subject: Is the branch information in kde_projects.xml used by the
> translation infrastructure?
> Message-ID: <87ty3i56vg.fsf@FreeBSD.org>
> Content-Type: text/plain
>
> Hi there,
>
> I was taking a look at the repository settings of the kdeutils modules
> in projects.kde.org and noticed the stable branch is still set to
> KDE/4.7 in them (and ksecrets had no stable branch set). Nonetheless, I
> see translation commits in the KDE/4.8 branch in many modules. Are the
> projects.kde.org used by any part of the translation stuff or do I not
> need to worry about updating the settings at the right time?
>
> Cheers,
> Raphael (with kdeutils coordinator hat)
>
>
>
> ------------------------------
>
> Message: 2
> Date: Thu, 26 Jan 2012 22:47:25 -0200
> From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
> To: kde-i18n-doc@kde.org
> Subject: Merging stable into master & i18n
> Message-ID: <87liou55uq.fsf@FreeBSD.org>
> Content-Type: text/plain
>
> Hi again.
>
> These days I was talking to Dakon on IRC about git merge'ing KDE/4.8
> into master to avoid cherry-picking commits all the time.
>
> As we all know, this currently presents some problems with the Scripty
> commits, as some stable translations will end up being merged into
> master (assuming there are no merge conflicts). It was later said that
> the translations would be automatically reverted later, so there wasn't
> much risk of screwing things up.
>
> Before doing that, I'd like to confirm with you guys that it would not
> cause problems for you if I did that.
>
> Thanks,
> rakuco (with Ark maintainer hat)
>
>
>
> ------------------------------
>
> Message: 3
> Date: Fri, 27 Jan 2012 07:38:48 +0100 (CET)
> From: Sebastian Sauer <sebastian.sauer@kdab.com>
> To: kde-commits@kde.org
> Cc: kde-i18n-doc@kde.org
> Subject: [calligra] /: Variables: Made file-name work + enable access
> to file-name, keywords and comments.
> Message-ID: <20120127063848.3B427A60C8@git.kde.org>
> Content-Type: text/plain; charset="utf-8"
>
> Git commit 3c54f5cd24cc3c5ebd6240070cc091783ca7fcb2 by Sebastian Sauer.
> Committed on 27/01/2012 at 07:22.
> Pushed by sebsauer into branch 'master'.
>
> Variables: Made file-name work + enable access to file-name, keywords and
> comments.
> This fixes the missing url in the footer at the docx from
> http://www.pro-linux.de/artikel/2/1553/ooxml-und-freie-textverarbeitungsprogramme.html
>
> @i18n: Asking for approval to introduce these new 3 strings to enable
> access to 3 basic functions in Words/Stage/Tables.
> CCMAIL:kde-i18n-doc@kde.org
>
> M +1 -0 libs/kotext/KoInlineObject.h
> M +2 -0 libs/kotext/KoInlineTextObjectManager.cpp
> M +9 -1 plugins/variables/InfoVariable.cpp
> M +24 -0 plugins/variables/InfoVariableFactory.cpp
>
> http://commits.kde.org/calligra/3c54f5cd24cc3c5ebd6240070cc091783ca7fcb2
>
> diff --git a/libs/kotext/KoInlineObject.h b/libs/kotext/KoInlineObject.h
> index a2aae3e..8a1d627 100644
> --- a/libs/kotext/KoInlineObject.h
> +++ b/libs/kotext/KoInlineObject.h
> @@ -65,6 +65,7 @@ public:
> Keywords,
> Subject,
> Description,
> + Comments,
> SenderPostalCode,
> SenderCity,
> SenderStreet,
> diff --git a/libs/kotext/KoInlineTextObjectManager.cpp
> b/libs/kotext/KoInlineTextObjectManager.cpp
> index c302b6c..5465148 100644
> --- a/libs/kotext/KoInlineTextObjectManager.cpp
> +++ b/libs/kotext/KoInlineTextObjectManager.cpp
> @@ -291,6 +291,8 @@ void
> KoInlineTextObjectManager::documentInformationUpdated(const QString &info,
> setProperty(KoInlineObject::Title, data);
> else if (info == "description")
> setProperty(KoInlineObject::Description, data);
> + else if (info == "comments")
> + setProperty(KoInlineObject::Comments, data);
> else if (info == "subject")
> setProperty(KoInlineObject::Subject, data);
> else if (info == "keyword")
> diff --git a/plugins/variables/InfoVariable.cpp
> b/plugins/variables/InfoVariable.cpp
> index 3a172dd..a74ae9a 100644
> --- a/plugins/variables/InfoVariable.cpp
> +++ b/plugins/variables/InfoVariable.cpp
> @@ -38,7 +38,8 @@ static const struct {
> { KoInlineObject::Title, "title", "text:title" },
> { KoInlineObject::Subject, "subject", "text:subject" },
> { KoInlineObject::Keywords, "keywords", "text:keywords" },
> - { KoInlineObject::Description, "description", "text:description" }
> + //{ KoInlineObject::Description, "description", "text:description" }
> + { KoInlineObject::Comments, "comments", "text:comments" }
> };
>
> static const unsigned int numPropertyData = sizeof(propertyData) /
> sizeof(*propertyData);
> @@ -104,5 +105,12 @@ bool InfoVariable::loadOdf(const KoXmlElement &
> element, KoShapeLoadingContext &
> const QString localName(element.localName());
> m_type = s_loadInfo->value(localName);
>
> + for(KoXmlNode node = element.firstChild(); !node.isNull(); node =
> node.nextSibling() ) {
> + if (node.isText()) {
> + setValue(node.toText().data());
> + break;
> + }
> + }
> +
> return true;
> }
> diff --git a/plugins/variables/InfoVariableFactory.cpp
> b/plugins/variables/InfoVariableFactory.cpp
> index 901914b..e1b3217 100644
> --- a/plugins/variables/InfoVariableFactory.cpp
> +++ b/plugins/variables/InfoVariableFactory.cpp
> @@ -56,6 +56,30 @@ InfoVariableFactory::InfoVariableFactory()
> var3.properties = props;
> addTemplate(var3);
>
> + KoInlineObjectTemplate var4;
> + var4.id = "file-name";
> + var4.name = i18n("File Name");
> + props = new KoProperties();
> + props->setProperty("vartype", KoInlineObject::DocumentURL);
> + var4.properties = props;
> + addTemplate(var4);
> +
> + KoInlineObjectTemplate var5;
> + var5.id = "keywords";
> + var5.name = i18n("Keywords");
> + props = new KoProperties();
> + props->setProperty("vartype", KoInlineObject::Keywords);
> + var5.properties = props;
> + addTemplate(var5);
> +
> + KoInlineObjectTemplate var6;
> + var6.id = "comments";
> + var6.name = i18n("Comments");
> + props = new KoProperties();
> + props->setProperty("vartype", KoInlineObject::Comments);
> + var6.properties = props;
> + addTemplate(var6);
> +
> QStringList elementNames(InfoVariable::tags());
> setOdfElementNames(KoXmlNS::text, elementNames);
> }
>
>
> ------------------------------
>
> Message: 4
> Date: Fri, 27 Jan 2012 08:16:27 +0000 (GMT)
> From: Albert Astals Cid <aacid@kde.org>
> To: KDE i18n-doc <kde-i18n-doc@kde.org>
> Subject: Re: Is the branch information in kde_projects.xml used by the
> translation infrastructure?
> Message-ID:
> <1327652187.83609.YahooMailClassic@web132206.mail.ird.yahoo.com>
> Content-Type: text/plain; charset=iso-8859-1
>
> --- El vie, 27/1/12, Raphael Kubo da Costa escribi?:
> > Hi there,
> >
> > I was taking a look at the repository settings of the
> > kdeutils modules
> > in projects.kde.org and noticed the stable branch is still
> > set to
> > KDE/4.7 in them (and ksecrets had no stable branch set).
> > Nonetheless, I
> > see translation commits in the KDE/4.8 branch in many
> > modules. Are the
> > projects.kde.org used by any part of the translation stuff
> > or do I not
> > need to worry about updating the settings at the right
> > time?
>
> Yes and no. Since project maintainers (mostly the ones that are shipped in
> SC) totally fail to set the correct branches when needed we maintain the
> authoritative branches in scripty itself. The project.kde.org ones are
> only a guidance and scripty only complains if they do not match.
>
> As a note the stable l10n branch is still 4.7 and the master one is 4.8
> for the SC projects, we will be making the switch so that trunk is master
> and stable 4.8 "soon" and then i'll bug you to change the settings on
> projects.kde.org (or do it myself for some projects i have access to).
>
> Hope i've been clear enough with the answer :-)
>
> Albert
>
> >
> > Cheers,
> > Raphael (with kdeutils coordinator hat)
> >
> >
>
>
> ------------------------------
>
> Message: 5
> Date: Fri, 27 Jan 2012 08:17:54 +0000 (GMT)
> From: Albert Astals Cid <aacid@kde.org>
> To: KDE i18n-doc <kde-i18n-doc@kde.org>
> Subject: Re: Merging stable into master & i18n
> Message-ID:
> <1327652274.62956.YahooMailClassic@web132204.mail.ird.yahoo.com>
> Content-Type: text/plain; charset=iso-8859-1
>
> --- El vie, 27/1/12, Raphael Kubo da Cost escribi?:
> > Hi again.
>
> Hi
>
> > These days I was talking to Dakon on IRC about git merge'ing
> > KDE/4.8
> > into master to avoid cherry-picking commits all the time.
> >
> > As we all know, this currently presents some problems with
> > the Scripty
> > commits, as some stable translations will end up being
> > merged into
> > master (assuming there are no merge conflicts). It was later
> > said that
> > the translations would be automatically reverted later, so
> > there wasn't
> > much risk of screwing things up.
> >
> > Before doing that, I'd like to confirm with you guys that it
> > would not
> > cause problems for you if I did that.
>
> Desktop file translations are updated daily with the contents of the
> corresponding .po file.
>
> Albert
>
> >
> > Thanks,
> > rakuco (with Ark maintainer hat)
> >
> >
>
>
> ------------------------------
>
> _______________________________________________
> kde-i18n-doc mailing list
> kde-i18n-doc@kde.org
> https://mail.kde.org/mailman/listinfo/kde-i18n-doc
>
>
> End of kde-i18n-doc Digest, Vol 106, Issue 37
> *********************************************
>
--
*Georgi Shutov*
*IT Manager *
*+359 878 577 047*
*Skype: g_shutov*
*UG Web Media Ltd.*
*www.luxmedia.bg*
*www.luxdar.com*
[Attachment #3 (text/html)]
Hello, <div>I have birthday today :) Im turning 24, and I decide to make a big change \
in my life with my new 3 servers :) I will join the conversantions soon when I \
re-locate my mashines :) <br><br>Have a nice day 2 U all :) </div> <div><br><div \
class="gmail_quote">2012/1/27 <span dir="ltr"><<a \
href="mailto:kde-i18n-doc-request@kde.org">kde-i18n-doc-request@kde.org</a>></span><br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> Send kde-i18n-doc mailing list submissions to<br>
<a href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a><br>
<br>
To subscribe or unsubscribe via the World Wide Web, visit<br>
<a href="https://mail.kde.org/mailman/listinfo/kde-i18n-doc" \
target="_blank">https://mail.kde.org/mailman/listinfo/kde-i18n-doc</a><br> or, via \
email, send a message with subject or body 'help' to<br>
<a href="mailto:kde-i18n-doc-request@kde.org">kde-i18n-doc-request@kde.org</a><br>
<br>
You can reach the person managing the list at<br>
<a href="mailto:kde-i18n-doc-owner@kde.org">kde-i18n-doc-owner@kde.org</a><br>
<br>
When replying, please edit your Subject line so it is more specific<br>
than "Re: Contents of kde-i18n-doc digest..."<br>
<br>
<br>
Today's Topics:<br>
<br>
1. Is the branch information in kde_projects.xml used by the<br>
translation infrastructure? (Raphael Kubo da Costa)<br>
2. Merging stable into master & i18n (Raphael Kubo da Costa)<br>
3. [calligra] /: Variables: Made file-name work + enable access<br>
to file-name, keywords and comments. (Sebastian Sauer)<br>
4. Re: Is the branch information in kde_projects.xml used by the<br>
translation infrastructure? (Albert Astals Cid)<br>
5. Re: Merging stable into master & i18n (Albert Astals Cid)<br>
<br>
<br>
----------------------------------------------------------------------<br>
<br>
Message: 1<br>
Date: Thu, 26 Jan 2012 22:25:23 -0200<br>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org><br>
To: <a href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a><br>
Subject: Is the branch information in kde_projects.xml used by the<br>
translation infrastructure?<br>
Message-ID: <87ty3i56vg.fsf@FreeBSD.org><br>
Content-Type: text/plain<br>
<br>
Hi there,<br>
<br>
I was taking a look at the repository settings of the kdeutils modules<br>
in <a href="http://projects.kde.org" target="_blank">projects.kde.org</a> and noticed \
the stable branch is still set to<br> KDE/4.7 in them (and ksecrets had no stable \
branch set). Nonetheless, I<br> see translation commits in the KDE/4.8 branch in many \
modules. Are the<br> <a href="http://projects.kde.org" \
target="_blank">projects.kde.org</a> used by any part of the translation stuff or do \
I not<br> need to worry about updating the settings at the right time?<br>
<br>
Cheers,<br>
Raphael (with kdeutils coordinator hat)<br>
<br>
<br>
<br>
------------------------------<br>
<br>
Message: 2<br>
Date: Thu, 26 Jan 2012 22:47:25 -0200<br>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org><br>
To: <a href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a><br>
Subject: Merging stable into master & i18n<br>
Message-ID: <87liou55uq.fsf@FreeBSD.org><br>
Content-Type: text/plain<br>
<br>
Hi again.<br>
<br>
These days I was talking to Dakon on IRC about git merge'ing KDE/4.8<br>
into master to avoid cherry-picking commits all the time.<br>
<br>
As we all know, this currently presents some problems with the Scripty<br>
commits, as some stable translations will end up being merged into<br>
master (assuming there are no merge conflicts). It was later said that<br>
the translations would be automatically reverted later, so there wasn't<br>
much risk of screwing things up.<br>
<br>
Before doing that, I'd like to confirm with you guys that it would not<br>
cause problems for you if I did that.<br>
<br>
Thanks,<br>
rakuco (with Ark maintainer hat)<br>
<br>
<br>
<br>
------------------------------<br>
<br>
Message: 3<br>
Date: Fri, 27 Jan 2012 07:38:48 +0100 (CET)<br>
From: Sebastian Sauer <<a \
href="mailto:sebastian.sauer@kdab.com">sebastian.sauer@kdab.com</a>><br>
To: <a href="mailto:kde-commits@kde.org">kde-commits@kde.org</a><br>
Cc: <a href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a><br>
Subject: [calligra] /: Variables: Made file-name work + enable access<br>
to file-name, keywords and comments.<br>
Message-ID: <<a href="mailto:20120127063848.3B427A60C8@git.kde.org">20120127063848.3B427A60C8@git.kde.org</a>><br>
Content-Type: text/plain; charset="utf-8"<br>
<br>
Git commit 3c54f5cd24cc3c5ebd6240070cc091783ca7fcb2 by Sebastian Sauer.<br>
Committed on 27/01/2012 at 07:22.<br>
Pushed by sebsauer into branch 'master'.<br>
<br>
Variables: Made file-name work + enable access to file-name, keywords and \
comments.<br> This fixes the missing url in the footer at the docx from <a \
href="http://www.pro-linux.de/artikel/2/1553/ooxml-und-freie-textverarbeitungsprogramme.html" \
target="_blank">http://www.pro-linux.de/artikel/2/1553/ooxml-und-freie-textverarbeitungsprogramme.html</a><br>
<br>
@i18n: Asking for approval to introduce these new 3 strings to enable access to 3 \
basic functions in Words/Stage/Tables.<br> <a \
href="mailto:CCMAIL%3Akde-i18n-doc@kde.org">CCMAIL:kde-i18n-doc@kde.org</a><br> <br>
M +1 -0 libs/kotext/KoInlineObject.h<br>
M +2 -0 libs/kotext/KoInlineTextObjectManager.cpp<br>
M +9 -1 plugins/variables/InfoVariable.cpp<br>
M +24 -0 plugins/variables/InfoVariableFactory.cpp<br>
<br>
<a href="http://commits.kde.org/calligra/3c54f5cd24cc3c5ebd6240070cc091783ca7fcb2" \
target="_blank">http://commits.kde.org/calligra/3c54f5cd24cc3c5ebd6240070cc091783ca7fcb2</a><br>
<br>
diff --git a/libs/kotext/KoInlineObject.h b/libs/kotext/KoInlineObject.h<br>
index a2aae3e..8a1d627 100644<br>
--- a/libs/kotext/KoInlineObject.h<br>
+++ b/libs/kotext/KoInlineObject.h<br>
@@ -65,6 +65,7 @@ public:<br>
Keywords,<br>
Subject,<br>
Description,<br>
+ Comments,<br>
SenderPostalCode,<br>
SenderCity,<br>
SenderStreet,<br>
diff --git a/libs/kotext/KoInlineTextObjectManager.cpp \
b/libs/kotext/KoInlineTextObjectManager.cpp<br> index c302b6c..5465148 100644<br>
--- a/libs/kotext/KoInlineTextObjectManager.cpp<br>
+++ b/libs/kotext/KoInlineTextObjectManager.cpp<br>
@@ -291,6 +291,8 @@ void KoInlineTextObjectManager::documentInformationUpdated(const \
QString &info,<br> setProperty(KoInlineObject::Title, data);<br>
else if (info == "description")<br>
setProperty(KoInlineObject::Description, data);<br>
+ else if (info == "comments")<br>
+ setProperty(KoInlineObject::Comments, data);<br>
else if (info == "subject")<br>
setProperty(KoInlineObject::Subject, data);<br>
else if (info == "keyword")<br>
diff --git a/plugins/variables/InfoVariable.cpp \
b/plugins/variables/InfoVariable.cpp<br> index 3a172dd..a74ae9a 100644<br>
--- a/plugins/variables/InfoVariable.cpp<br>
+++ b/plugins/variables/InfoVariable.cpp<br>
@@ -38,7 +38,8 @@ static const struct {<br>
{ KoInlineObject::Title, "title", "text:title" },<br>
{ KoInlineObject::Subject, "subject", "text:subject" },<br>
{ KoInlineObject::Keywords, "keywords", "text:keywords" \
},<br>
- { KoInlineObject::Description, "description", \
"text:description" }<br> + //{ KoInlineObject::Description, \
"description", "text:description" }<br> + { \
KoInlineObject::Comments, "comments", "text:comments" }<br> \
};<br> <br>
static const unsigned int numPropertyData = sizeof(propertyData) / \
sizeof(*propertyData);<br> @@ -104,5 +105,12 @@ bool InfoVariable::loadOdf(const \
KoXmlElement & element, KoShapeLoadingContext &<br> const QString \
localName(element.localName());<br> m_type = s_loadInfo->value(localName);<br>
<br>
+ for(KoXmlNode node = element.firstChild(); !node.isNull(); node = \
node.nextSibling() ) {<br> + if (node.isText()) {<br>
+ setValue(node.toText().data());<br>
+ break;<br>
+ }<br>
+ }<br>
+<br>
return true;<br>
}<br>
diff --git a/plugins/variables/InfoVariableFactory.cpp \
b/plugins/variables/InfoVariableFactory.cpp<br> index 901914b..e1b3217 100644<br>
--- a/plugins/variables/InfoVariableFactory.cpp<br>
+++ b/plugins/variables/InfoVariableFactory.cpp<br>
@@ -56,6 +56,30 @@ InfoVariableFactory::InfoVariableFactory()<br>
var3.properties = props;<br>
addTemplate(var3);<br>
<br>
+ KoInlineObjectTemplate var4;<br>
+ <a href="http://var4.id" target="_blank">var4.id</a> = \
"file-name";<br> + <a href="http://var4.name" \
target="_blank">var4.name</a> = i18n("File Name");<br> + props = new \
KoProperties();<br> + props->setProperty("vartype", \
KoInlineObject::DocumentURL);<br> + var4.properties = props;<br>
+ addTemplate(var4);<br>
+<br>
+ KoInlineObjectTemplate var5;<br>
+ <a href="http://var5.id" target="_blank">var5.id</a> = "keywords";<br>
+ <a href="http://var5.name" target="_blank">var5.name</a> = \
i18n("Keywords");<br> + props = new KoProperties();<br>
+ props->setProperty("vartype", KoInlineObject::Keywords);<br>
+ var5.properties = props;<br>
+ addTemplate(var5);<br>
+<br>
+ KoInlineObjectTemplate var6;<br>
+ <a href="http://var6.id" target="_blank">var6.id</a> = "comments";<br>
+ <a href="http://var6.name" target="_blank">var6.name</a> = \
i18n("Comments");<br> + props = new KoProperties();<br>
+ props->setProperty("vartype", KoInlineObject::Comments);<br>
+ var6.properties = props;<br>
+ addTemplate(var6);<br>
+<br>
QStringList elementNames(InfoVariable::tags());<br>
setOdfElementNames(KoXmlNS::text, elementNames);<br>
}<br>
<br>
<br>
------------------------------<br>
<br>
Message: 4<br>
Date: Fri, 27 Jan 2012 08:16:27 +0000 (GMT)<br>
From: Albert Astals Cid <<a href="mailto:aacid@kde.org">aacid@kde.org</a>><br>
To: KDE i18n-doc <<a \
href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a>><br>
Subject: Re: Is the branch information in kde_projects.xml used by the<br>
translation infrastructure?<br>
Message-ID:<br>
<<a href="mailto:1327652187.83609.YahooMailClassic@web132206.mail.ird.yahoo.com">1327652187.83609.YahooMailClassic@web132206.mail.ird.yahoo.com</a>><br>
Content-Type: text/plain; charset=iso-8859-1<br>
<br>
--- El vie, 27/1/12, Raphael Kubo da Costa escribi?:<br>
> Hi there,<br>
><br>
> I was taking a look at the repository settings of the<br>
> kdeutils modules<br>
> in <a href="http://projects.kde.org" target="_blank">projects.kde.org</a> and \
noticed the stable branch is still<br> > set to<br>
> KDE/4.7 in them (and ksecrets had no stable branch set).<br>
> Nonetheless, I<br>
> see translation commits in the KDE/4.8 branch in many<br>
> modules. Are the<br>
> <a href="http://projects.kde.org" target="_blank">projects.kde.org</a> used by \
any part of the translation stuff<br> > or do I not<br>
> need to worry about updating the settings at the right<br>
> time?<br>
<br>
Yes and no. Since project maintainers (mostly the ones that are shipped in SC) \
totally fail to set the correct branches when needed we maintain the authoritative \
branches in scripty itself. The <a href="http://project.kde.org" \
target="_blank">project.kde.org</a> ones are only a guidance and scripty only \
complains if they do not match.<br>
<br>
As a note the stable l10n branch is still 4.7 and the master one is 4.8 for the SC \
projects, we will be making the switch so that trunk is master and stable 4.8 \
"soon" and then i'll bug you to change the settings on <a \
href="http://projects.kde.org" target="_blank">projects.kde.org</a> (or do it myself \
for some projects i have access to).<br>
<br>
Hope i've been clear enough with the answer :-)<br>
<br>
Albert<br>
<br>
><br>
> Cheers,<br>
> Raphael (with kdeutils coordinator hat)<br>
><br>
><br>
<br>
<br>
------------------------------<br>
<br>
Message: 5<br>
Date: Fri, 27 Jan 2012 08:17:54 +0000 (GMT)<br>
From: Albert Astals Cid <<a href="mailto:aacid@kde.org">aacid@kde.org</a>><br>
To: KDE i18n-doc <<a \
href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a>><br>
Subject: Re: Merging stable into master & i18n<br>
Message-ID:<br>
<<a href="mailto:1327652274.62956.YahooMailClassic@web132204.mail.ird.yahoo.com">1327652274.62956.YahooMailClassic@web132204.mail.ird.yahoo.com</a>><br>
Content-Type: text/plain; charset=iso-8859-1<br>
<br>
--- El vie, 27/1/12, Raphael Kubo da Cost escribi?:<br>
> Hi again.<br>
<br>
Hi<br>
<br>
> These days I was talking to Dakon on IRC about git merge'ing<br>
> KDE/4.8<br>
> into master to avoid cherry-picking commits all the time.<br>
><br>
> As we all know, this currently presents some problems with<br>
> the Scripty<br>
> commits, as some stable translations will end up being<br>
> merged into<br>
> master (assuming there are no merge conflicts). It was later<br>
> said that<br>
> the translations would be automatically reverted later, so<br>
> there wasn't<br>
> much risk of screwing things up.<br>
><br>
> Before doing that, I'd like to confirm with you guys that it<br>
> would not<br>
> cause problems for you if I did that.<br>
<br>
Desktop file translations are updated daily with the contents of the corresponding \
.po file.<br> <br>
Albert<br>
<br>
><br>
> Thanks,<br>
> rakuco (with Ark maintainer hat)<br>
><br>
><br>
<br>
<br>
------------------------------<br>
<br>
_______________________________________________<br>
kde-i18n-doc mailing list<br>
<a href="mailto:kde-i18n-doc@kde.org">kde-i18n-doc@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/kde-i18n-doc" \
target="_blank">https://mail.kde.org/mailman/listinfo/kde-i18n-doc</a><br> <br>
<br>
End of kde-i18n-doc Digest, Vol 106, Issue 37<br>
*********************************************<br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><b><font face="arial, \
helvetica, sans-serif">Georgi Shutov</font></b><div><b><font face="arial, helvetica, \
sans-serif">IT Manager </font></b></div><div><b><font face="arial, helvetica, \
sans-serif">+359 878 577 047</font></b></div> <div><b><font face="arial, helvetica, \
sans-serif">Skype: g_shutov</font></b></div><div><b><font face="arial, helvetica, \
sans-serif">UG Web Media Ltd.</font></b></div><div><b><a \
href="http://www.luxmedia.bg" target="_blank"><font face="arial, helvetica, \
sans-serif">www.luxmedia.bg</font></a></b></div> <div><b><a \
href="http://www.luxdar.com" target="_blank"><font face="arial, helvetica, \
sans-serif">www.luxdar.com</font></a></b></div><br> </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic