l10n daemon script
79de5d3958
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-01-28 05:42:48 +01:00
l10n daemon script
a5eda6348f
GIT_SILENT made messages (after extraction)
2020-01-28 03:10:03 +01:00
Albert Astals Cid
88e5775f34
Merge remote-tracking branch 'origin/release/19.12'
2020-01-07 23:28:40 +01:00
Christoph Feck
475652a990
Update Appstream for new release
2020-01-06 14:55:05 +01:00
Albert Astals Cid
8d6109de65
Merge remote-tracking branch 'origin/release/19.12'
2019-12-24 11:13:36 +01:00
Ahmad Samir
54494cc3d4
[generators/*] Replace deprecated foreach with range-for
2019-12-23 06:06:25 +00:00
Albert Astals Cid
78cf6bd910
CI: enable more modernize checks
...
Since unfortunately some of the autogenerated includes don't pass the
checks we do a trick of building out of source and then specifying the
.*/okular/.* path as the only includes we care about
2019-12-18 12:51:13 +01:00
Albert Astals Cid
f7f2b3105f
Increase version here too
2019-12-05 23:50:27 +01:00
Christoph Feck
7974aa1d36
Update Appstream for new release
2019-12-05 22:05:15 +01:00
Albert Astals Cid
da21543a50
Small performance improvements
2019-10-05 22:16:43 +02:00
l10n daemon script
bf7a53d62b
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-08-12 05:10:27 +02:00
Laurent Montel
cb691f70dc
Fix some clazy warning
...
Summary: fix clazy warning
Reviewers: aacid
Reviewed By: aacid
Subscribers: nicolasfella, okular-devel
Tags: #okular
Differential Revision: https://phabricator.kde.org/D20832
2019-05-27 08:02:57 +02:00
l10n daemon script
a7742d4604
GIT_SILENT made messages (after extraction)
2019-05-22 03:10:30 +02:00
l10n daemon script
aaa176041d
GIT_SILENT made messages (after extraction)
2019-02-16 03:14:15 +01:00
l10n daemon script
241bc6525a
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-02-10 05:27:14 +01:00
l10n daemon script
33a5f67eb2
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-24 05:59:57 +02:00
l10n daemon script
4e9bbfddb0
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:37:12 +02:00
l10n daemon script
96f4f27ba6
GIT_SILENT made messages (after extraction)
2018-10-10 04:08:48 +02:00
Yuri Chornoivan
39b6e8147d
Fix minor EBN issues
2018-09-01 11:25:57 +03:00
Yuri Chornoivan
c04ca1fa96
Fix minor EBN issues
2018-08-31 12:23:45 +03:00
l10n daemon script
f1d3c68115
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-08-04 05:43:46 +02:00
l10n daemon script
5f93a0b90e
GIT_SILENT made messages (after extraction)
2018-08-04 03:45:00 +02:00
l10n daemon script
c4570f7e40
GIT_SILENT made messages (after extraction)
2018-07-16 03:26:51 +02:00
l10n daemon script
879a46ac55
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-07-07 05:17:35 +02:00
l10n daemon script
26c40ab7bd
GIT_SILENT made messages (after extraction)
2018-05-06 03:31:04 +02:00
l10n daemon script
29b1dec92b
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-01-29 05:04:25 +01:00
l10n daemon script
066805c550
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-12-01 04:51:24 +01:00
l10n daemon script
22885c00b0
GIT_SILENT made messages (after extraction)
2017-12-01 03:10:28 +01:00
l10n daemon script
02a4cfb26a
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-11-28 06:52:56 +01:00
l10n daemon script
0ef249b5a5
GIT_SILENT made messages (after extraction)
2017-11-28 05:48:07 +01:00
Albert Astals Cid
f621cd0c42
Add a few overrides
2017-11-03 15:20:01 +01:00
l10n daemon script
1883a06614
GIT_SILENT made messages (after extraction)
2017-10-20 03:05:06 +02:00
l10n daemon script
72abe6f85a
GIT_SILENT made messages (after extraction)
2017-10-11 06:41:11 +02:00
Albert Astals Cid
69982161e7
Merge remote-tracking branch 'origin/Applications/17.08'
2017-08-30 23:08:20 +02:00
Albert Astals Cid
9a25ea41dc
Fix warning about TRANSLATION_DOMAIN being defined twice
2017-08-30 23:07:03 +02:00
Luigi Toscano
d9584b30d8
Merge remote-tracking branch 'origin/Applications/17.08'
2017-08-30 01:29:21 +02:00
Luigi Toscano
e858ecdd7c
Fix translations: add translation domain for generators
...
Generators are libraries, so define the proper TRANSLATION_DOMAIN
for each for them.
Thanks Albert for spotting this.
2017-08-30 01:27:35 +02:00
l10n daemon script
3349c9fff7
GIT_SILENT made messages (after extraction)
2017-08-27 05:21:29 +02:00
l10n daemon script
3422520a5c
GIT_SILENT made messages (after extraction)
2017-08-27 03:08:01 +02:00
l10n daemon script
0b85b7c138
GIT_SILENT made messages (after extraction)
2017-08-26 05:23:57 +02:00
l10n daemon script
e279e26b40
GIT_SILENT made messages (after extraction)
2017-08-26 03:18:37 +02:00
l10n daemon script
36c60741fb
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-07-30 04:54:11 +02:00
l10n daemon script
19406fdf57
GIT_SILENT made messages (after extraction)
2017-07-30 03:25:35 +02:00
l10n daemon script
767a1c0eac
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-05-21 04:36:10 +02:00
l10n daemon script
bfe1f62eb5
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-05-12 04:21:17 +02:00
l10n daemon script
ef9ea64bc3
GIT_SILENT made messages (after extraction)
2017-05-12 02:59:10 +02:00
l10n daemon script
94fbca1c95
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-04-22 04:06:38 +02:00
l10n daemon script
a25642c178
GIT_SILENT made messages (after extraction)
2017-04-22 02:52:16 +02:00
l10n daemon script
91e740c236
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-04-17 04:01:59 +02:00
l10n daemon script
cce5cf2592
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-04-09 04:02:44 +02:00