l10n daemon script
|
cd1d36df29
|
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
|
dc104a44dc
|
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 |
Albert Astals Cid
|
c80b59f1de
|
I said use new API
|
9 years ago |
|
Albert Astals Cid
|
b4ac0be485
|
Use the new API
|
9 years ago |
|
Albert Astals Cid
|
191a37fb52
|
Q_DECL_OVERRIDE -> override
|
9 years ago |
|
Albert Astals Cid
|
4072eb0c3a
|
Add override
|
9 years ago |
|
l10n daemon script
|
5b7a8d3d67
|
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
|
15543ea8bd
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
c55c44ed95
|
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
|
2a0bdca687
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
963ce79c45
|
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
|
7381616690
|
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
|
53a6cde141
|
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
|
0922f2f524
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
0e1cf0fbb9
|
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
|
0cbf1d24e7
|
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 |
Martin T. H. Sandsmark
|
7f3eebd9f3
|
Only show warning messages by default
REVIEW: 129832
|
9 years ago |
|
l10n daemon script
|
a8a6268183
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
e44b17080a
|
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
|
93b824de9e
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
4290dffb1b
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
30993aa3f1
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
fb77e0d1fd
|
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
|
006cb782a2
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
20f6524016
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
b6614c4da4
|
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
|
6bc9feaba4
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
4952893372
|
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
|
e798a92c06
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
4ed39dfc16
|
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
|
8c2120e2d3
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
0d6f6edf60
|
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
|
31da71cdec
|
GIT_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
5282d434ee
|
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
|
56759cd0b3
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
dcb3edcf30
|
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
|
4c8280e461
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
fa74d6eea7
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
297795d40d
|
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
|
e65f2c6f62
|
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
|
fecf0a8de6
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
fe628b9dbf
|
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
|
96fd8111c1
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
5527fe1d44
|
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
|
43cde01ced
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
3fe1bef3d6
|
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
|
f505e51b32
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
|
l10n daemon script
|
da42e4b166
|
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
|
5ddc51b6c3
|
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
|
6aaf19e884
|
SVN_SILENT made messages (after extraction)
|
9 years ago |
