l10n daemon script
|
bea51aa002
|
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"
|
2026-11-02 01:51:37 +00:00 |
|
l10n daemon script
|
9b562de8b7
|
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"
|
2026-11-01 01:52:47 +00:00 |
|
l10n daemon script
|
7ab21c175a
|
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"
|
2026-10-27 02:06:16 +00:00 |
|
l10n daemon script
|
d2f101ea16
|
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"
|
2026-10-23 01:46:45 +00:00 |
|
l10n daemon script
|
cbe53cdc78
|
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"
|
2026-10-20 02:07:07 +00:00 |
|
l10n daemon script
|
53698305ce
|
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"
|
2026-10-18 02:00:49 +00:00 |
|
l10n daemon script
|
74914f1ce3
|
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"
|
2026-10-17 01:57:20 +00:00 |
|
l10n daemon script
|
6372e5d0b2
|
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"
|
2026-10-16 01:55:45 +00:00 |
|
l10n daemon script
|
dd5473a924
|
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"
|
2026-10-15 01:54:31 +00:00 |
|
l10n daemon script
|
e19adfb295
|
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"
|
2026-10-14 02:05:06 +00:00 |
|
Albert Astals Cid
|
e7a026f9d4
|
Fix action names
BUGS: 526886
|
2026-10-13 11:36:37 +00:00 |
|
l10n daemon script
|
4ce137deb1
|
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"
|
2026-10-04 01:48:16 +00:00 |
|
l10n daemon script
|
de3308213e
|
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"
|
2026-08-18 01:41:40 +00:00 |
|
l10n daemon script
|
7394045856
|
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"
|
2026-07-22 01:41:30 +00:00 |
|
l10n daemon script
|
7b853f79aa
|
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"
|
2026-05-08 01:40:03 +00:00 |
|
l10n daemon script
|
7bf30d25f0
|
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"
|
2026-04-07 01:40:16 +00:00 |
|
l10n daemon script
|
1e9af8b2c1
|
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"
|
2026-02-12 01:40:36 +00:00 |
|
l10n daemon script
|
9a3c072a87
|
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"
|
2026-02-11 01:41:36 +00:00 |
|
l10n daemon script
|
d287cea212
|
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"
|
2026-02-03 01:44:19 +00:00 |
|
l10n daemon script
|
6f5634a144
|
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"
|
2026-01-29 01:40:03 +00:00 |
|
l10n daemon script
|
af70df6494
|
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"
|
2025-12-22 01:36:20 +00:00 |
|
l10n daemon script
|
0425558dc2
|
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"
|
2025-10-27 01:36:01 +00:00 |
|
l10n daemon script
|
381b1e4893
|
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"
|
2025-10-16 01:34:48 +00:00 |
|
l10n daemon script
|
46250002c7
|
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"
|
2025-10-04 01:35:17 +00:00 |
|
l10n daemon script
|
b1f85c0e0a
|
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"
|
2025-09-08 01:59:22 +00:00 |
|
l10n daemon script
|
913ab6155a
|
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"
|
2025-08-17 01:34:00 +00:00 |
|
l10n daemon script
|
2268142b53
|
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"
|
2025-08-05 01:37:40 +00:00 |
|
l10n daemon script
|
8a9247b3f5
|
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"
|
2025-06-17 01:33:47 +00:00 |
|
l10n daemon script
|
469dbc4580
|
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"
|
2025-05-31 01:33:36 +00:00 |
|
l10n daemon script
|
72b8a80686
|
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"
|
2025-05-30 01:34:03 +00:00 |
|
l10n daemon script
|
4b7b372d0b
|
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"
|
2025-05-20 01:32:28 +00:00 |
|
l10n daemon script
|
70c932d6b9
|
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"
|
2025-05-19 01:32:42 +00:00 |
|
l10n daemon script
|
4afeae8d54
|
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"
|
2025-05-16 01:32:40 +00:00 |
|
l10n daemon script
|
b289101ba7
|
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"
|
2025-05-04 01:33:18 +00:00 |
|
l10n daemon script
|
55473177dd
|
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"
|
2025-04-28 01:30:31 +00:00 |
|
l10n daemon script
|
52dc9dd056
|
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"
|
2025-04-19 01:30:18 +00:00 |
|
l10n daemon script
|
b6226dd9b5
|
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"
|
2025-04-14 01:29:32 +00:00 |
|
l10n daemon script
|
82fbe9d2ba
|
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"
|
2025-04-13 01:29:34 +00:00 |
|
l10n daemon script
|
335f84654e
|
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"
|
2025-04-08 01:31:39 +00:00 |
|
l10n daemon script
|
8b33f75375
|
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"
|
2025-04-07 01:32:40 +00:00 |
|
l10n daemon script
|
97757214f3
|
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"
|
2025-04-06 01:30:43 +00:00 |
|
l10n daemon script
|
4870e97d70
|
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"
|
2025-04-05 01:31:06 +00:00 |
|
l10n daemon script
|
a21ab0ade4
|
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"
|
2025-04-04 01:31:20 +00:00 |
|
l10n daemon script
|
2c8c3176f6
|
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"
|
2025-04-03 01:30:36 +00:00 |
|
l10n daemon script
|
4eecad39f0
|
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"
|
2025-04-01 01:30:39 +00:00 |
|
l10n daemon script
|
19463b3f57
|
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"
|
2025-03-31 01:29:51 +00:00 |
|
l10n daemon script
|
ae35fb6d4b
|
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"
|
2025-03-30 01:30:38 +00:00 |
|
l10n daemon script
|
6c97683d32
|
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"
|
2025-03-29 01:31:03 +00:00 |
|
Nicolas Fella
|
b1d57cb388
|
Use desktop file based shortcuts for touchpad shortcuts
We want to move towards those since they have some advantages over the classic shortcuts
|
2025-03-28 12:44:23 +00:00 |
|