l10n daemon script
3ee4efe9df
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
eab6d204c4
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
4203dd3c32
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
3608fc42c5
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
b4a6262acf
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
90b6131548
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
cf13c240c8
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
8210717f5c
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
0c22b575c4
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
938f9c0652
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
d3cb7d249f
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
680d9046b5
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
7651afffc9
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
33c8b1c228
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
eca848fd11
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
6928e16339
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
3148c0d9e8
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
ff58cd5cc1
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
b5fc131938
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
a0c3783a3a
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
58b53bb24c
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
f197dca5a1
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
b6699357d9
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
36ab362a0b
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
726234026b
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
151215a919
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4c7ef0af9d
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
58d4380967
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
25321cd00a
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
c6bf94f38a
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
1e98f249ed
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
2d65a950cc
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
b050ccf71d
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
b8ef08f629
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
ae537307a7
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
3d556481a3
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
Kurt Hindenburg
82941586f0
Revert "Remove pointless Desktop Actions"
...
This reverts commit 3440ab0ab3 .
The --new-tab has been fixed to work
9 years ago
l10n daemon script
a9c15f85d8
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
87e830ee6b
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
cfd0a7aead
GIT_SILENT made messages (after extraction)
9 years ago
Harald Sitter
621fe3b745
expand the initial appdata paragraph
...
appstreamgenerator hints that it would like a longer first paragraph. steal
the one from the documentation which seems suitably verbose and descriptive
REVIEW: 129889
9 years ago
l10n daemon script
b7e75cfa14
GIT_SILENT made messages (after extraction)
9 years ago
Kai Uwe Broulik
3440ab0ab3
Remove pointless Desktop Actions
...
All they do is spawn a new Konsole instance, even the --new-tab option.
REVIEW: 129674
9 years ago
l10n daemon script
e5afbb5361
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
73cedbb628
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4ccfa71b31
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
c8508cebb7
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
1d750940de
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"
10 years ago
l10n daemon script
b075c4f077
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"
10 years ago
l10n daemon script
e51946f9e8
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"
10 years ago