l10n daemon script
d0a211005d
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
757f30c92d
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
andreas kainz
524066ca22
update alignement for system monitoring applets
...
REVIEW: 128136
10 years ago
l10n daemon script
f5546cb5e6
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
8517232757
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
f9893549ba
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
c937f440b1
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
39d73d2edb
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
5435e568df
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
f82cc932c8
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
471be951e0
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
278ba70509
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b2173723ce
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
69d7f7480a
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
3b05d0cad9
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
cccf297b25
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b20460ef8e
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
10856b8411
SVN_SILENT made messages (.desktop file)
10 years ago
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
l10n daemon script
29e7eaf0be
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
3973041666
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
0e35c812b0
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
ae16b20c02
Restore semantic icon for use in tooltips and notifications
...
Previews are now fetched from the plugin name, so we don't need to set
that twice.
10 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"
10 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
Marco Martin
6e3c17e5c8
Add some formfactor info to plasma-workspace applets
...
added some formfactor keywords in the applets metadata.
once the explorer model filters them accordingly,
it should remove a bit of applets problematic on
the phone for one reason or another
REVIEW:125810
11 years ago
l10n daemon script
80c1c7eada
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
d3277e8269
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
andreas kainz
fd04b714d4
applets: link to new breeze icons for applets
...
REVIEW: 125438
11 years ago
l10n daemon script
ef8e9abb33
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
6635cdc956
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
andreas kainz
33ec9fd62c
Widget screenshot for widget explorer
11 years ago
l10n daemon script
4207c67625
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
4dbb05ac96
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
66d1ad7ccf
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
0cd67e377b
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
3b9b7b2aed
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
564487ab23
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
Marco Martin
6f4a13e547
no horizontal lines for systemmonitor widgets
11 years ago
l10n daemon script
59292eea40
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
1f37ac1fa2
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
Marco Martin
c1e9715fa0
adjust layout for smaller panels or vertical ones
...
BUG:347594
11 years ago
Marco Martin
77d18c9877
remove the sharedengine extension from desktop files
11 years ago
Marco Martin
619aaa9fdd
add all X-Plasma-RequiredExtensions=SharedEngine
...
also port away from plasmapackage:/ urls when needed
11 years ago
l10n daemon script
1536c4c41c
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
b09a3b2a86
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
Marco Martin
2078e5c2f8
adjust layout in panels
...
don't show titles in panels and stack graphs horizontally on horizontal panels
BUG:346295
11 years ago
l10n daemon script
4764dc57b7
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
f6a426697f
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
16b45aab39
SVN_SILENT made messages (.desktop file)
11 years ago