Commit Graph

185 Commits

Author SHA1 Message Date
l10n daemon script
b4a42d3616 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 10:07:41 +00:00
andreas kainz
6c20f17af9 Breeze Icon: add widget icon to notes 2015-10-12 11:41:42 +02:00
l10n daemon script
98583160cb 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-08-28 10:20:30 +00:00
l10n daemon script
c718ba4b48 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-08-26 10:19:25 +00:00
l10n daemon script
a5ff979996 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-08-10 10:12:53 +00:00
l10n daemon script
a989a77a0d 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-06-03 10:14:00 +00:00
l10n daemon script
9ea35bd26d 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-05-27 10:14:57 +00:00
l10n daemon script
81ec3e0d58 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-05-16 11:30:30 +00:00
l10n daemon script
a48529b3c8 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-05-01 10:21:06 +00:00
l10n daemon script
4207218d8b 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-26 09:45:20 +00:00
l10n daemon script
7897780310 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-18 10:26:53 +00:00
l10n daemon script
505c1f8cba 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-07 13:16:44 +00:00
l10n daemon script
b7e5392a7b 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-19 09:50:52 +00:00
l10n daemon script
104f37b8c8 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-16 10:11:21 +00:00
l10n daemon script
5265842028 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-14 10:19:38 +00:00
l10n daemon script
e44eb9edec SVN_SILENT made messages (.desktop file) 2015-02-27 11:41:25 +00:00
l10n daemon script
073b83b440 SVN_SILENT made messages (.desktop file) 2015-02-16 10:17:17 +00:00
l10n daemon script
03bae89ac5 SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
l10n daemon script
8fb6f677dd SVN_SILENT made messages (.desktop file) 2015-01-29 09:16:20 +00:00
l10n daemon script
4b1970cf83 SVN_SILENT made messages (.desktop file) 2015-01-27 11:23:41 +00:00
l10n daemon script
fb4932bf3c SVN_SILENT made messages (.desktop file) 2015-01-26 09:01:51 +00:00
l10n daemon script
b46bd92d0d SVN_SILENT made messages (.desktop file) 2015-01-21 08:54:32 +00:00
l10n daemon script
65f867b152 SVN_SILENT made messages (.desktop file) 2015-01-19 08:58:56 +00:00
l10n daemon script
d255c63ce2 SVN_SILENT made messages (.desktop file) 2015-01-13 11:36:35 +00:00
l10n daemon script
41777ed685 SVN_SILENT made messages (.desktop file) 2015-01-06 10:55:19 +00:00
l10n daemon script
050c7707bf SVN_SILENT made messages (.desktop file) 2015-01-03 09:14:08 +00:00
l10n daemon script
1afbc2c461 SVN_SILENT made messages (.desktop file) 2015-01-02 09:15:04 +00:00
l10n daemon script
6f7a3ae9ea SVN_SILENT made messages (.desktop file) 2014-12-30 10:48:32 +00:00
l10n daemon script
53d694072c SVN_SILENT made messages (.desktop file) 2014-12-19 09:15:56 +00:00
l10n daemon script
f64207f408 SVN_SILENT made messages (.desktop file) 2014-12-14 08:54:42 +00:00
l10n daemon script
d47e417e40 SVN_SILENT made messages (.desktop file) 2014-12-07 08:47:50 +00:00
l10n daemon script
cf3898f7a9 SVN_SILENT made messages (.desktop file) 2014-12-01 08:51:21 +00:00
l10n daemon script
7d8ebae3f7 SVN_SILENT made messages (.desktop file) 2014-11-30 08:55:13 +00:00
l10n daemon script
0b944473d1 SVN_SILENT made messages (.desktop file) 2014-11-26 08:31:20 +00:00
l10n daemon script
8415c20760 SVN_SILENT made messages (.desktop file) 2014-11-23 08:53:19 +00:00
l10n daemon script
db195f66dc SVN_SILENT made messages (.desktop file) 2014-11-18 10:41:47 +00:00
l10n daemon script
6f854997d6 SVN_SILENT made messages (.desktop file) 2014-11-17 08:38:53 +00:00
l10n daemon script
0517bc2b62 SVN_SILENT made messages (.desktop file) 2014-11-16 08:53:17 +00:00
l10n daemon script
dcd299a3f9 SVN_SILENT made messages (.desktop file) 2014-11-15 09:06:57 +00:00
l10n daemon script
0e13fb9833 SVN_SILENT made messages (.desktop file) 2014-11-14 09:03:12 +00:00
Albert Astals Cid
f7043425c1 Keywords separator is ; 2014-11-14 01:31:23 +01:00
l10n daemon script
43049221ab SVN_SILENT made messages (.desktop file) 2014-11-12 08:52:06 +00:00
l10n daemon script
1a4b23f845 SVN_SILENT made messages (.desktop file) 2014-11-04 10:53:50 +00:00
l10n daemon script
150f24b30c SVN_SILENT made messages (.desktop file) 2014-10-27 08:35:46 +00:00
l10n daemon script
4a4e3dc526 SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:08 +00:00
l10n daemon script
b65201b735 SVN_SILENT made messages (.desktop file) 2014-10-15 08:33:00 +00:00
l10n daemon script
88ccf7be3d SVN_SILENT made messages (.desktop file) 2014-09-22 08:34:39 +00:00
l10n daemon script
edc9eae84b SVN_SILENT made messages (.desktop file) 2014-09-10 08:47:20 +00:00
l10n daemon script
dc61b4d5c2 SVN_SILENT made messages (.desktop file) 2014-09-04 08:36:35 +00:00
l10n daemon script
cf93514991 SVN_SILENT made messages (.desktop file) 2014-09-02 10:43:04 +00:00