l10n daemon script
|
392d287b64
|
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-11 04:47:22 +02:00 |
|
l10n daemon script
|
5427754e21
|
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-01 04:51:32 +02:00 |
|
l10n daemon script
|
3d0acf15a5
|
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-06-27 05:13:07 +02:00 |
|
l10n daemon script
|
ee1a535cc2
|
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-05-08 05:42:59 +02:00 |
|
l10n daemon script
|
283211b4eb
|
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:19:16 +02:00 |
|
l10n daemon script
|
e40312bf5e
|
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-06-18 05:27:46 +02:00 |
|
l10n daemon script
|
057a114629
|
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-09-19 04:58:52 +02:00 |
|
l10n daemon script
|
dadcc76841
|
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-08-06 06:02:06 +02:00 |
|
l10n daemon script
|
cc43a72884
|
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-14 05:43:50 +02:00 |
|
l10n daemon script
|
0d217c58e1
|
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-27 04:22:53 +02:00 |
|
l10n daemon script
|
fd64a8bcc7
|
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-01-06 05:54:14 +01:00 |
|
l10n daemon script
|
e6a7df25aa
|
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"
|
2016-12-20 12:45:03 +01:00 |
|
l10n daemon script
|
b4e008847a
|
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"
|
2016-11-25 04:58:17 +01:00 |
|
l10n daemon script
|
73c6e1a306
|
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"
|
2016-11-24 05:29:38 +01:00 |
|
l10n daemon script
|
f0eb32c350
|
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"
|
2016-10-19 09:02:51 +00:00 |
|
l10n daemon script
|
3be06839a8
|
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"
|
2016-10-11 13:08:45 +00:00 |
|
l10n daemon script
|
ec0ca3976d
|
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"
|
2016-09-29 12:27:06 +00:00 |
|
l10n daemon script
|
2664b99864
|
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"
|
2016-08-30 10:03:14 +00:00 |
|
l10n daemon script
|
ae766f5839
|
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"
|
2016-08-04 12:30:52 +00:00 |
|
l10n daemon script
|
60c3bf9b90
|
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"
|
2016-06-22 16:33:04 +00:00 |
|
l10n daemon script
|
f6724de704
|
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"
|
2016-02-14 09:18:22 +00:00 |
|
l10n daemon script
|
5eb9a54bcc
|
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"
|
2016-02-05 09:16:28 +00:00 |
|
l10n daemon script
|
fc2bd97e69
|
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"
|
2015-11-17 12:54:36 +00:00 |
|
l10n daemon script
|
e424bcec1a
|
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"
|
2015-11-04 17:00:05 +00:00 |
|
l10n daemon script
|
633952b638
|
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"
|
2015-10-27 12:30:00 +00:00 |
|
l10n daemon script
|
dda5ec5385
|
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"
|
2015-10-26 03:37:32 +00:00 |
|
l10n daemon script
|
4239b0525b
|
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"
|
2015-10-25 03:57:27 +00:00 |
|
l10n daemon script
|
9f291d9ef7
|
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"
|
2015-10-02 10:15:24 +00:00 |
|
l10n daemon script
|
5795e27191
|
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"
|
2015-09-10 11:33:23 +00:00 |
|
l10n daemon script
|
8349588c77
|
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"
|
2015-04-06 09:54:12 +00:00 |
|
l10n daemon script
|
92cd693566
|
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"
|
2015-03-29 09:58:52 +00:00 |
|
l10n daemon script
|
08eaaf11e1
|
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"
|
2015-03-25 09:09:47 +00:00 |
|
l10n daemon script
|
917104ff99
|
SVN_SILENT made messages (.desktop file)
|
2014-12-26 04:20:08 +00:00 |
|
l10n daemon script
|
365b2c55b2
|
SVN_SILENT made messages (.desktop file)
|
2014-12-25 04:06:46 +00:00 |
|
l10n daemon script
|
3b192ea18e
|
SVN_SILENT made messages (.desktop file)
|
2014-11-02 04:01:28 +00:00 |
|
l10n daemon script
|
b2d50aaf9a
|
SVN_SILENT made messages (.desktop file)
|
2014-07-01 06:21:38 +00:00 |
|
l10n daemon script
|
a48b066ab4
|
SVN_SILENT made messages (.desktop file)
|
2014-06-29 04:35:25 +00:00 |
|
Aleix Pol
|
6ce0b6b874
|
Document in the desktop files the outgoing types for the plugins
This way we narrow the things a plugin can send, to its own scope. Still
every plugin can set a list of types, so it should be ok.
|
2014-06-14 20:35:00 +02:00 |
|
Aleix Pol
|
741abafaf7
|
Move the plugins into a different top-ĺevel directory
Reviewed by Albert Vaca
|
2014-06-14 16:34:11 +02:00 |
|