l10n daemon script
|
b50685eadf
|
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"
|
5 years ago |
|
l10n daemon script
|
a89fe5ea4b
|
GIT_SILENT made messages (after extraction)
|
5 years ago |
Christoph Feck
|
6231d63eb8
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit 9a53c705722708bc2a98a3e66371876f67e01d12)
|
5 years ago |
|
l10n daemon script
|
406a22fc61
|
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"
|
5 years ago |
|
l10n daemon script
|
293356e7c7
|
GIT_SILENT made messages (after extraction)
|
5 years ago |
|
Christoph Feck
|
eed2f127ad
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit fdc0c242af22483d8171956c9b1ffc8e9b62deab)
|
5 years ago |
|
l10n daemon script
|
8cbf3bdd0c
|
GIT_SILENT made messages (after extraction)
|
5 years ago |
|
l10n daemon script
|
15a5bed7d0
|
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"
|
6 years ago |
|
l10n daemon script
|
51ffea0cc9
|
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"
|
6 years ago |
|
Christoph Feck
|
83edc9c599
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit 5065e5a292)
|
6 years ago |
|
Christoph Feck
|
5065e5a292
|
GIT_SILENT Update Appstream for new release
|
6 years ago |
|
l10n daemon script
|
62c9bd2722
|
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"
|
6 years ago |
|
l10n daemon script
|
5eab459c0f
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
7731ab51ef
|
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"
|
6 years ago |
|
l10n daemon script
|
45426529d4
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
c28c256dae
|
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"
|
6 years ago |
|
l10n daemon script
|
eb2c7876c3
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
Christoph Feck
|
2314536d0c
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit aa452ef633)
|
6 years ago |
|
Christoph Feck
|
aa452ef633
|
GIT_SILENT Update Appstream for new release
|
6 years ago |
|
l10n daemon script
|
60275a75d3
|
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"
|
6 years ago |
|
l10n daemon script
|
95095d39b8
|
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"
|
6 years ago |
|
Christoph Feck
|
0d1fe2eab6
|
GIT_SILENT Update Appstream for new release
|
6 years ago |
|
Christoph Feck
|
87825c36e9
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit 0d1fe2eab6)
|
6 years ago |
Luigi Toscano
|
5f32ed8787
|
appdata: more general doc URL
Use the reference URL for the documentation.
|
6 years ago |
|
l10n daemon script
|
4f4560a692
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
ea4e12ba5b
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
371aa057aa
|
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"
|
6 years ago |
|
l10n daemon script
|
dcf54998d1
|
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"
|
6 years ago |
|
l10n daemon script
|
88068f13e1
|
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"
|
6 years ago |
|
l10n daemon script
|
ada60ddce6
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
05656270f2
|
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"
|
6 years ago |
|
l10n daemon script
|
f1731f87c7
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
0332d2e2e8
|
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"
|
6 years ago |
|
l10n daemon script
|
81f3fec156
|
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"
|
6 years ago |
|
l10n daemon script
|
a5df264cc1
|
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"
|
6 years ago |
|
Christoph Feck
|
4b1c9f28e5
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit 63ef5c8484)
|
6 years ago |
|
Christoph Feck
|
63ef5c8484
|
GIT_SILENT Update Appstream for new release
|
6 years ago |
|
l10n daemon script
|
a5a8149703
|
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"
|
6 years ago |
|
l10n daemon script
|
110533eae7
|
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"
|
6 years ago |
|
l10n daemon script
|
975412af57
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
e7cf659866
|
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"
|
6 years ago |
|
l10n daemon script
|
3f2ad74a64
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
8b987d608f
|
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"
|
6 years ago |
|
l10n daemon script
|
48ef871ae8
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
l10n daemon script
|
9497e834ca
|
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"
|
6 years ago |
|
l10n daemon script
|
92811105ba
|
GIT_SILENT made messages (after extraction)
|
6 years ago |
|
Christoph Feck
|
4ee719d452
|
GIT_SILENT Update Appstream for new release
(cherry picked from commit a915b1304d)
|
6 years ago |
|
Christoph Feck
|
a915b1304d
|
GIT_SILENT Update Appstream for new release
|
6 years ago |
|
l10n daemon script
|
cc47a69cf8
|
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"
|
6 years ago |
|
l10n daemon script
|
0d66753c63
|
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"
|
6 years ago |
