Hi,
In attachment there is the updated translation for the locale zh_TW
with corrections, supplements and new messages for Trinity.
Best regards,
Wei-Lun Chao
Guys,
I have a local tree that I converted to 3.5.13-sru. However, not all of the
modules switched to sru -- how did that happen? When I try a 'git pull' and 'git
submodule init' I get:
Module: 'applications/abakus' - current local branch is already 'v3.5.13-sru'
U admin
U cmake
U src/CMakeLists.txt
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
Skipping unmerged submodule admin
Skipping unmerged submodule cmake
I ran into a few build issues today on one box (can't find 'tde-config') and
tracing it back, ran into this problem. I have another local tree that I
converted to 3.5.13-sru and it went fine. Now I have to figure out how to 'fix'
the one that didn't come all the way to 3513-sru. Here are the packages I'm
having issues on:
(good)
module: applications/desktop-effects-tde branch: v3.5.13-sru available: HEAD
master v3.5.13-sru
(bad)
applications/compizconfig-backend-kconfig branch: master available:
HEAD master
(it doesn't eve show v3.5.13-sru available)
(good)
applications/kaffeine-mozilla branch: v3.5.13-sru available: HEAD master
v3.5.13-sru
(bad)
applications/kaffeine-mozilla branch: master available: HEAD master
I don't get it ;( I do the same thing on the same packages, but then end up
with one tree not going all the way to v3.5.13-sru.
To make the switch, I test the local branch against the remote branch, If
local is not v3.5.13-sru and remote has v3.5.13-sru available, then I do:
git checkout v3.5.13-sru # to switch
git pull
git submodule update
If v3.5.13-sru isn't immediately returned as available, then I try:
## normal reset to head, discard local edits and update
git reset --hard HEAD
git clean -dxf
git pull
git reset --hard HEAD
git clean -dxf
sed -i "s/system@/${gituser}@/g" .gitmodules
git submodule init
git submodule update --recursive
git submodule foreach --recursive "git checkout master"
git submodule foreach --recursive "git pull"
git checkout -- .gitmodules
followed by
git checkout v3.5.13-sru # to switch
git pull
git submodule update
Somehow that has ended up with abakus and about 4 other packages in a state
where a git pull results in:
Module: 'applications/abakus' - current local branch is already 'v3.5.13-sru'
U admin
U cmake
U src/CMakeLists.txt
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
Skipping unmerged submodule admin
Skipping unmerged submodule cmake
So how to fix? I'm just bewildered by the whole GIT personality....
--
David C. Rankin, J.D.,P.E.
Slavek,
3.5.13-sru code built very well with all current commits applied plus the
additional patches for cups > 1.6 applied. This was built against the current
Arch (latest upstreams for all libs).
Full build list:
http://www.3111skyline.com/dl/dt/tde/doc/bldlist-x86_64-0814.txt
(i686 still building...)
--
David C. Rankin, J.D.,P.E.
Hey,
when I open anything with konqueror ( eg in a konsole, "konqueror ./"
), it always opens properly, but there is an extra empty tab also
open.
anyone seen this behavior?
Calvin
François, David, all
I noticed patches "Update deprecated XKeycodeToKeysym call" - I seem to be
suitable for cherry-pick to v3.5.13-sru.
What do you think?
Slavek
--
Tim, All,
To track the recent handful of ftbfs for k3b, k9copy, kdmtheme, krusader due
to scope/declaration issues that have surfaced, I have opened:
http://bugs.pearsoncomputing.net/bugzilla/show_bug.cgi?id=1119
That will provide a common point to work from.
--
David C. Rankin, J.D.,P.E.
Slavek,
I think there is a t->k problem in
tdevelop/kdevdesigner/designer/listeditor.ui.h:33:5. The error at 89% is:
In file included from /build/src/build/kdevdesigner/designer/listeditor.cpp:22:0:
/build/src/build/kdevdesigner/designer/listeditor.ui.h: In member function
'virtual void ListEditor::addItem()':
/build/src/build/kdevdesigner/designer/listeditor.ui.h:33:5: error: 'App' was
not declared in this scope
The code is:
void ListEditor::addItem()
{
TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() );
i->setRenameEnabled( 0, TRUE );
33 tqApp->processEvents();
i->startRename( 0 );
}
Is this supposed to be 'qApp' instead of 'tqApp'? I don't know if this is a
needed 'tqt-interface' 't' or a stray 't' from the TQt3 rename. What say the
experts?
--
David C. Rankin, J.D.,P.E.