l10n daemon script
|
74364c02be
|
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
|
13520a2e4c
|
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
|
dadf0a3174
|
Breeze Icons: Start 32px action icons
|
11 years ago |
l10n daemon script
|
e0dbf4b108
|
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
|
dc7ad2e89f
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
9989f2c424
|
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
|
683781f815
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
594a7e9a5b
|
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
|
23389ee467
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
0b95c24216
|
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
|
7840988bec
|
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
|
7c0a390882
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
8a65950bdc
|
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
|
793679f7ee
|
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
|
b66f14c162
|
Breeze Icons: first widget icons
|
11 years ago |
l10n daemon script
|
e32ea1b38e
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
f324bce24d
|
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
|
1d9c517638
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
5b5836eadc
|
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
|
09d4a26d08
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
15dae5a544
|
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
|
3b9af16f64
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
6d07797854
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
Uri Herrera
|
62533c159e
|
22px icons for system-file-manager and utilities-terminal were used for Dolphins toolbr I removed as users complained that the icons were being displayed in the task manager, obviously this means that the bigger icons are now used for the toolbar, so.. yeah. I also removed the 16 and 22 icons of preferences-system to give system settings the same treatment. So far nothing looks broken.
|
11 years ago |
Uri Herrera
|
7142fcf089
|
Edited description and name in index files
|
11 years ago |
Uri Herrera
|
4d74ce27b2
|
Edited descriptin and name in index files
|
11 years ago |
l10n daemon script
|
7d0e97f50b
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
c962d43f78
|
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
|
e755c678a2
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
a1aa5993a0
|
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 |
Uri Herrera
|
d00cb9d618
|
Updated index files
|
11 years ago |
Uri Herrera
|
b9bed77625
|
Updated index files
|
11 years ago |
andreas kainz
|
1baa026e34
|
Breeze theme file changes
|
11 years ago |
andreas kainz
|
68251f75bd
|
Breeze Icons: move from github
trademark icons are removed
|
11 years ago |
l10n daemon script
|
91cf2cc9df
|
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
|
17de56d096
|
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
|
69ab9cf0ab
|
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
|
534aef1368
|
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
|
8626291ed3
|
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
|
b56afac11b
|
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
|
c1d586d62e
|
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 |
Uri Herrera
|
3c398dd700
|
Added .gitignore to icons and icons-dark folders, synced GitHub repo with KDE Breeze repo
|
11 years ago |
andreas kainz
|
eec55e9096
|
Breeze Icons: New Folder structure according to
Flattr, Nitrux and Oxygen
|
11 years ago |
andreas kainz
|
6418e84acd
|
Breeze-dark backup icon set is breeze
(cherry picked from commit 6c9319e52e)
|
11 years ago |
andreas kainz
|
6c9319e52e
|
Breeze-dark backup icon set is breeze
|
11 years ago |
Jonathan Riddell
|
f926109904
|
new icons from andreas <kainz.a@gmail.com>
|
11 years ago |
andreas kainz
|
61e89d4c00
|
Breeze-icons: small-places are from not fixed
|
11 years ago |
andreas kainz
|
dd4c5c5f21
|
Update Breeze-Icons from the github working dictionary
|
11 years ago |
andreas kainz
|
bd16dd1551
|
Update Breeze icon set from github working dic
|
11 years ago |
andreas kainz
|
c517ddc31b
|
Breeze Icons: Add new icons and sync breeze with breeze-dark
|
11 years ago |