l10n daemon script
8e5a578302
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
10 years ago
Benedikt Gollatz
41df1bdb8b
Mitigate failed icon grabbing in xembed-sni-proxy
...
If grabbed icons are blank, try to salvage the copied data as well as
possible while leaving setups where image grabbing works fine alone.
Based on a patch by Rakyn Barker.
BUG:355684
REVIEW: 126336
10 years ago
l10n daemon script
6168154dee
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
2fbe27fed2
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
10 years ago
David Edmundson
968b14962a
Fix quit if we fail to claim
...
Cherry-picked from: https://github.com/davidedmundson/xembed-sni-proxy/commit/11e8648
REVIEW: 126080
10 years ago
l10n daemon script
119f72abb7
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
57157834c7
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
10 years ago
l10n daemon script
c87cfbbafc
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
c662902c17
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
10 years ago
l10n daemon script
40f0461650
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
10 years ago
l10n daemon script
f8aee97f19
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
10 years ago
l10n daemon script
9dc7e360a4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
l10n daemon script
248f1d8f6b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
l10n daemon script
f538cdaa9e
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
l10n daemon script
38095521cc
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
l10n daemon script
f40d2325ad
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
l10n daemon script
ed0ce07ac5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
Eugene Paskevich
c4d3d42ec4
Merge xembed SNI proxy updates
...
Hush the NetWinInfo deprecation warning
Hush the int narrowing warning
Create the container window on-screen
Switch to 32x32 pixel icons and avoid scaling
Made sure container window is under mouse upon click
Reviewed-by: David Edmundson
11 years ago
David Edmundson
2fc947526d
Proxy Xembed icons to SNI
...
The goal of this project is to make xembed system trays available in
Plasma.
This is to allow legacy apps (xchat, pidgin, tuxguitar) etc. system
trays[1] available in Plasma which only supports StatusNotifierItem [2].
Ideally we also want this to work in an xwayland session, making X
system tray icons available even when plasmashell only has a wayland
connection.
REVIEW: 125655
11 years ago