alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,452 Commits 1 Branch 0 Tags 40 MiB
af8ed75b29
Commit Graph

60 Commits

Author SHA1 Message Date
l10n daemon script
af8ed75b29 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"
 2020-06-18 05:32:17 +02:00
l10n daemon script
9683f15a36 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"
 2020-06-17 13:59:56 +02:00
l10n daemon script
1049bca147 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"
 2020-05-31 20:19:54 +02:00
l10n daemon script
9a3351fae5 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-20 04:58:25 +02:00
l10n daemon script
4b7bac26cc 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:27:59 +02:00
Friedrich W. H. Kossebau
dc529c34ff Remove long-time deprecated Encoding=UTF-8 from example desktop files 2018-03-10 02:18:22 +01:00
l10n daemon script
e80ebab9db 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-02-25 05:27:39 +01:00
l10n daemon script
24193527bf 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-11 04:56:36 +02:00
l10n daemon script
bba40b9b9d 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-02-05 06:07:10 +01:00
l10n daemon script
2f4e59e902 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-22 05:52:51 +01:00
l10n daemon script
793441b77b 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:53:44 +01:00
l10n daemon script
71b8f9b22d 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-09 09:25:38 +00:00
l10n daemon script
13dc03991d 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-06 09:49:14 +00:00
l10n daemon script
01f4cf59ea 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:07:45 +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
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
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
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
03bae89ac5 SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
l10n daemon script
fb4932bf3c SVN_SILENT made messages (.desktop file) 2015-01-26 09:01:51 +00:00
l10n daemon script
1afbc2c461 SVN_SILENT made messages (.desktop file) 2015-01-02 09:15:04 +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
43049221ab SVN_SILENT made messages (.desktop file) 2014-11-12 08:52:06 +00:00
l10n daemon script
4a4e3dc526 SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:08 +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
8afadc6410 SVN_SILENT made messages (.desktop file) 2014-07-10 04:23:58 +00:00
l10n daemon script
b06bb52100 SVN_SILENT made messages (.desktop file) 2014-06-29 08:42:52 +00:00
l10n daemon script
b092bbed31 SVN_SILENT made messages (.desktop file) 2014-06-12 08:31:04 +00:00
l10n daemon script
fd1674450e SVN_SILENT made messages (.desktop file) 2014-05-25 08:47:48 +00:00
l10n daemon script
1b3060649c SVN_SILENT made messages (.desktop file) 2014-05-14 08:29:33 +00:00
l10n daemon script
5713f72542 SVN_SILENT made messages (.desktop file) 2014-05-03 08:34:24 +00:00
l10n daemon script
d55335d2a9 SVN_SILENT made messages (.desktop file) 2014-05-02 08:52:44 +00:00
l10n daemon script
238bc54c5b SVN_SILENT made messages (.desktop file) 2014-04-29 10:13:52 +00:00
l10n daemon script
012b0681c9 SVN_SILENT made messages (.desktop file) 2014-04-29 04:51:45 +00:00
l10n daemon script
d2f752597f SVN_SILENT made messages (.desktop file) 2014-04-28 15:59:04 +00:00
l10n daemon script
8fcd320f27 SVN_SILENT made messages (.desktop file) 2014-04-28 12:45:07 +00:00
l10n daemon script
b9130c7c24 SVN_SILENT made messages (.desktop file) 2014-04-28 09:02:00 +00:00
l10n daemon script
880da9b195 SVN_SILENT made messages (.desktop file) 2014-04-28 05:09:56 +00:00
l10n daemon script
dfd425ae82 SVN_SILENT made messages (.desktop file) 2014-04-27 21:04:10 +00:00
l10n daemon script
cbf1e988e9 SVN_SILENT made messages (.desktop file) 2014-04-27 16:44:26 +00:00
l10n daemon script
d149d719a9 SVN_SILENT made messages (.desktop file) 2014-04-27 05:19:59 +00:00
l10n daemon script
16ea0c68f6 SVN_SILENT made messages (.desktop file) 2014-04-19 04:52:27 +00:00
l10n daemon script
709d60a737 SVN_SILENT made messages (.desktop file) 2014-04-18 05:16:48 +00:00
l10n daemon script
99900255bf SVN_SILENT made messages (.desktop file) 2014-03-23 04:47:33 +00:00