Commit graph

153 commits

Author SHA1 Message Date
l10n daemon script
d2c6bb6eba 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"
2025-01-19 01:27:07 +00:00
l10n daemon script
9c5bd66558 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"
2024-12-15 01:29:22 +00:00
l10n daemon script
3541a2c702 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"
2024-09-14 01:22:41 +00:00
l10n daemon script
0fa47b6250 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"
2024-05-06 01:16:08 +00:00
l10n daemon script
c6b386bc62 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"
2024-01-18 01:11:09 +00:00
Friedrich W. H. Kossebau
f4177b7fa3 Store theme files as SVG in repo, compress to SVGZ only on installation
Allows any changes to SVG files to be committed as normal text diffs.
2023-11-28 01:15:43 +01:00
l10n daemon script
415228f9da 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"
2023-10-02 02:09:20 +00:00
l10n daemon script
76a43ac514 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"
2023-09-26 02:13:43 +00:00
l10n daemon script
51215708a7 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"
2023-05-14 01:41:19 +00:00
l10n daemon script
84bab8defc 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"
2023-03-22 01:46:18 +00:00
l10n daemon script
0204fcef33 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"
2023-03-05 01:54:54 +00:00
l10n daemon script
e49ef2b98c 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"
2022-10-01 01:51:39 +00:00
l10n daemon script
dd15db0734 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"
2022-05-28 02:07:13 +00:00
l10n daemon script
d3d6e41da9 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"
2022-04-05 01:45:35 +00:00
l10n daemon script
e138c64377 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"
2022-04-03 01:51:37 +00:00
l10n daemon script
1a82b4517d 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"
2022-03-20 02:00:15 +00:00
Mifeng Lytel
225f106d84 Fix sRGB profile in png icon
libpng complains about the 22x22 icon with the warning
"libpng warning: iCCP: known incorrect sRGB profile"

Running pngcrush with "-n -q" options display the following message:
"pngcrush: iCCP: Not recognizing known sRGB profile that has been
edited"

My quick solution for this is to run mogrify on the file.
2022-02-06 04:17:11 +02:00
l10n daemon script
2bd517498d 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"
2022-01-05 01:49:37 +00:00
l10n daemon script
625cfd7b01 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"
2021-08-23 01:22:51 +00:00
l10n daemon script
2c7cb51226 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"
2021-07-05 01:14:07 +00:00
l10n daemon script
8701c1bf88 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"
2021-07-03 01:17:21 +00:00
l10n daemon script
155747ce4f 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"
2021-01-07 06:42:30 +01:00
l10n daemon script
6256113321 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"
2020-11-23 06:01:02 +01:00
l10n daemon script
64c73569cb 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"
2020-08-20 06:07:25 +02:00
l10n daemon script
870dfe7e22 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"
2020-06-18 05:33:13 +02:00
l10n daemon script
0d8514f93c 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"
2020-06-17 14:00:47 +02:00
l10n daemon script
d5730a1727 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"
2020-04-04 06:32:06 +02:00
l10n daemon script
90b573c1e5 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"
2019-10-14 05:04:11 +02:00
l10n daemon script
0de9b09ae6 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"
2019-01-06 05:34:19 +01:00
l10n daemon script
473b024487 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"
2018-10-10 06:33:33 +02:00
l10n daemon script
a715d2fe49 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"
2017-08-24 04:44:36 +02:00
l10n daemon script
be5a23ddaa 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"
2017-08-06 06:03:16 +02:00
l10n daemon script
8b65479c0e 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"
2017-06-30 04:31:19 +02:00
Luigi Toscano
345b09e06f Merge remote-tracking branch 'origin/master' into frameworks 2017-04-15 11:13:52 +02:00
l10n daemon script
a06cf45b9f 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"
2016-01-13 03:27:22 +00:00
Michal Humpula
f12b894dc5 Port to frameworks branch: mark last move stone
REVIEW: 125506
GUI: visually marking last move with slightly different stone
2016-01-08 03:38:56 +01:00
Michal Humpula
26cb60513e mark last move stone
REVIEW: 125506
GUI: visually marking last move with slightly different stone
2015-12-02 19:24:24 +01:00
l10n daemon script
339910d1e7 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"
2015-11-05 04:19:08 +00:00
l10n daemon script
9eb28fe24f 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"
2015-05-23 04:06:56 +00:00
Montel Laurent
58bdcfc57a Rename icons 2015-03-15 07:56:37 +01:00
Montel Laurent
2c12505341 Use new macro for use icon on Win/MacOsX. Use new KDE_ macro. 2015-03-03 13:35:36 +01:00
l10n daemon script
2c63ecee6b SVN_SILENT made messages (.desktop file) 2015-02-10 04:45:01 +00:00
l10n daemon script
5d7389ac86 SVN_SILENT made messages (.desktop file) 2014-12-30 04:19:57 +00:00
Montel Laurent
f2f183bfe4 Port to KF5 2014-12-03 13:28:57 +01:00
l10n daemon script
e9ecdc82d9 SVN_SILENT made messages (.desktop file) 2014-07-25 05:36:00 +00:00
l10n daemon script
d935caeb0f SVN_SILENT made messages (.desktop file) 2014-07-24 04:48:58 +00:00
l10n daemon script
e43956072d SVN_SILENT made messages (.desktop file) 2014-06-30 04:39:53 +00:00
l10n daemon script
93776ca4a2 SVN_SILENT made messages (.desktop file) 2014-04-24 05:00:30 +00:00
l10n daemon script
60dab2158d SVN_SILENT made messages (.desktop file) 2014-04-02 04:54:37 +00:00
l10n daemon script
fcde045be9 SVN_SILENT made messages (.desktop file) 2013-12-23 03:56:56 +00:00