l10n daemon script
|
b16dcf41aa
|
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
|
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"
|
7 years ago |
|
l10n daemon script
|
a7742d4604
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
|
l10n daemon script
|
aaa176041d
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
|
l10n daemon script
|
5e01eff352
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
|
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"
|
7 years ago |
|
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"
|
8 years ago |
|
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"
|
8 years ago |
|
l10n daemon script
|
96f4f27ba6
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
Yuri Chornoivan
|
c04ca1fa96
|
Fix minor EBN issues
|
8 years ago |
Oliver Sander
|
59b8770545
|
Remove unused file
BUGS: 397429
|
8 years ago |
|
l10n daemon script
|
d85fe1df64
|
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"
|
8 years ago |
|
l10n daemon script
|
bae0e13719
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
|
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"
|
8 years ago |
|
l10n daemon script
|
5f93a0b90e
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
|
l10n daemon script
|
55c1cd433e
|
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"
|
8 years ago |
|
l10n daemon script
|
f670a18bd9
|
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"
|
8 years ago |
|
l10n daemon script
|
c4570f7e40
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
|
l10n daemon script
|
2e73a6d76f
|
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"
|
8 years ago |
|
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"
|
8 years ago |
|
l10n daemon script
|
b7c733f459
|
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"
|
8 years ago |
|
l10n daemon script
|
ee57925c57
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
|
l10n daemon script
|
26c40ab7bd
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
|
l10n daemon script
|
9c6494b353
|
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"
|
8 years ago |
|
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"
|
8 years ago |
|
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"
|
8 years ago |
|
l10n daemon script
|
22885c00b0
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
|
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"
|
8 years ago |
|
l10n daemon script
|
0ef249b5a5
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
Henrik Fehlauer
|
f777e2a924
|
Fix CMake Error in generators/spectre/CMakeLists.txt
Summary:
When porting from `add_library` to `okular_add_generator`, 2f9246ae42
missed to remove `MODULE` for spectre, which is already implicitly added
as can be seen [here](https://phabricator.kde.org/source/kcoreaddons/browse/master/KF5CoreAddonsMacros.cmake;83623a46c9862ee37535de93427dec0b0c55e24d$139).
This causes the upcoming CMake 3.10 to print the error `Cannot find
source file`, which can be fixed by removing the superfluous `MODULE`.
BUG: 386176
Test Plan:
No error shown anymore with CMake 3.10.0-rc4. Still works with CMake
3.5.1.
Reviewers: #okular, ngraham
Reviewed By: ngraham
Tags: #okular
Differential Revision: https://phabricator.kde.org/D8612
|
8 years ago |
|
l10n daemon script
|
1883a06614
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
76a4ad6323
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
72abe6f85a
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
d288b417da
|
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"
|
9 years ago |
|
l10n daemon script
|
24b481658e
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
26c9a860bb
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
Albert Astals Cid
|
9a25ea41dc
|
Fix warning about TRANSLATION_DOMAIN being defined twice
|
9 years ago |
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.
|
9 years ago |
|
l10n daemon script
|
3349c9fff7
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
3422520a5c
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
0b85b7c138
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
e279e26b40
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
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"
|
9 years ago |
|
l10n daemon script
|
19406fdf57
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
451bb151c2
|
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"
|
9 years ago |
|
l10n daemon script
|
5af987dac0
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
bb8c12d1eb
|
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"
|
9 years ago |
|
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"
|
9 years ago |
|
l10n daemon script
|
58d23a20ae
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
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"
|
9 years ago |
