l10n daemon script
42a0c5637a
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"
7 years ago
l10n daemon script
132b85b36d
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"
7 years ago
l10n daemon script
537a9ca3d5
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"
7 years ago
l10n daemon script
080c599922
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"
7 years ago
Friedrich W. H. Kossebau
03e13b10d8
[weather dataengine] bbc,envcan,noaa: fix day/night calculation for observe
...
"time" engine ignores the timezone in the passed DateTime variable,
only looks at the one given in the first argument
7 years ago
Friedrich W. H. Kossebau
28d0af6791
[weather dataengine] envcan: fix forecast icons to match "ice pellets"
...
Complements the same done before for the translation terms in
c5414f0d31
7 years ago
l10n daemon script
7799cea7b3
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"
7 years ago
l10n daemon script
9afd582c78
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"
7 years ago
l10n daemon script
33e66f4e7c
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"
7 years ago
l10n daemon script
417e0d431e
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"
7 years ago
Friedrich W. H. Kossebau
ed7c5796eb
weather dataengine] noaa: another forecast string found in use
7 years ago
l10n daemon script
76d1f13514
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"
7 years ago
Nate Graham
36a85c5e56
Use new Notifications KCM icon in other appropriate places too
...
Summary: D18678 changes the Notifications KCM's icon. This patch uses that same icon in the Notifications widget in places where clicking on it will open the KCM.
Test Plan: {F6586488, size=full}
Reviewers: broulik, #plasma
Reviewed By: broulik, #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18723
7 years ago
l10n daemon script
8b71af0341
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"
7 years ago
l10n daemon script
8d628a4b08
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"
7 years ago
l10n daemon script
d9bbe59e04
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"
7 years ago
l10n daemon script
6e61fcc20c
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"
7 years ago
Friedrich W. H. Kossebau
7e852a230e
[weather dataengine]: bbc: fix description, UK MET no longer the data provider
...
Have to keep "bbcukmet" as engine id though, mapping to a new "correct" id
would be too complex for no UI gain
7 years ago
Friedrich W. H. Kossebau
182ef20af6
weather dataengine] noaa: support more "Slight Chance *" forecast strings
7 years ago
Friedrich W. H. Kossebau
6b4e250004
[weather dataengine] Remove duplicated condition/forecast strings
...
GIT_SILENT
(cherry picked from commit ad0f6834a2 )
7 years ago
Pino Toscano
65f3a9610f
StatusItemNotifier: fix overlays by name with icons by name
...
Summary:
Setting an overlay by name results in a QIcon for it created; OTOH,
this icon is never used to create the final image in case the
main/attention icons are set by name too.
Since KIconEngine supports overlays natively, directly pass the list of
overlays (with just one element -- the overlay set) to it. As result,
main/attention icons by name are created directly with the requested
overlay by name.
Test Plan:
- builds fine
- main/attention icon by name + overlay by name works now, showing the requested overlay
- main/attention icon by name + overlay by pixmap still works as before
- main/attention icon by pixmap is unaffected, no matter whether/which overlay is set
- the system tray icons of juk, and amarok now have the play/pause overlays
Reviewers: apol
Reviewed By: apol
Subscribers: davidedmundson, apol, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D17983
7 years ago
l10n daemon script
abc2d564a7
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"
7 years ago
l10n daemon script
9428884630
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"
7 years ago
Friedrich W. H. Kossebau
91633c6cef
[weather dataengine] noaa: add another forecast string found in use
7 years ago
Friedrich W. H. Kossebau
458fdeac4b
[weather dataengine] bbc: use night icons for forecast "Tonight"
7 years ago
l10n daemon script
bbc1b685ae
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"
7 years ago
Noah Davis
ffc47c6e22
Change icons for Activities dataengine and runner
...
Summary:
KCMs should have color icons while widgets should have monochrome icons, so I have changed the name of the KCM icon.
Depends on D18529
Reviewers: #vdg, #plasma, ngraham
Reviewed By: #vdg, ngraham
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18532
7 years ago
l10n daemon script
7383a93e21
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"
7 years ago
l10n daemon script
b21e262bb9
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"
7 years ago
l10n daemon script
ec7f62b766
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"
7 years ago
l10n daemon script
4434af7725
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"
7 years ago
Yuri Chornoivan
21236c46c0
Fix minor Doxygen issues
7 years ago
l10n daemon script
5d6410de38
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"
7 years ago
l10n daemon script
c761342a0f
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"
7 years ago
l10n daemon script
d20799548a
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"
7 years ago
Friedrich W. H. Kossebau
2097b61490
[weather dataengine] envcan: fix typo in forecast string "Mainly sunny"
7 years ago
Friedrich W. H. Kossebau
0ab3d161c6
[weather dataengine] envcan: support also "Partly cloudy" forecast
7 years ago
Friedrich W. H. Kossebau
f0134f6441
[weather dataengine] bbc: adapt to changed strings for same day in forecast
7 years ago
Friedrich W. H. Kossebau
419097542f
[weather dataengine] noaa: add more forecast strings found in use
7 years ago
Friedrich W. H. Kossebau
ad0f6834a2
[weather dataengine] Remove duplicated condition/forecast strings
7 years ago
Friedrich W. H. Kossebau
3a38a57106
[weather dataengine] envcan: support also "Mainly cloudy" forecast
7 years ago
Friedrich W. H. Kossebau
a9c537dbda
[weather dataengine] noaa: use https over http
7 years ago
Friedrich W. H. Kossebau
075629b96e
[weather dataengine] noaa: fix unknown icon for Flurries
7 years ago
Kai Uwe Broulik
2907d7f54c
Support Bluetooth batteries
...
Differential Revision: https://phabricator.kde.org/D17346
7 years ago
Laurent Montel
ce04cdc185
Fix url
7 years ago
Aleix Pol
722aff93b5
Include the website on the metadata.desktop files
7 years ago
l10n daemon script
0d1c0e8b9e
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"
7 years ago
l10n daemon script
703f837f6b
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"
7 years ago
l10n daemon script
d2737d2b55
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"
7 years ago
l10n daemon script
87ceaab777
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"
7 years ago