summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <elvis.angelaccio@kde.org>2016-09-17 11:31:25 (GMT)
committerElvis Angelaccio <elvis.angelaccio@kde.org>2016-09-17 11:35:30 (GMT)
commit76415d098f6b523ba5981c9c0090de6dbf0fbe7d (patch)
tree304be2b71c9e3b8a54a73cf98f48c39d9ca8223c
parent2ed09ee0cec75f7cc6e2dd8311db12986e52916b (diff)
Fix broken merge
Merge commit 5927ecbd19f7b6c3b9873278158c5daa3666ee2a did not pick the changes in kerfuffle_clirar.json.cmake, because of -Xours. Fixed by `git checkout Applications/16.08 plugins/clirarplugin/kerfuffle_clirar.json.cmake`
-rw-r--r--plugins/clirarplugin/kerfuffle_clirar.json.cmake98
1 files changed, 53 insertions, 45 deletions
diff --git a/plugins/clirarplugin/kerfuffle_clirar.json.cmake b/plugins/clirarplugin/kerfuffle_clirar.json.cmake
index 1e7206a..a722840 100644
--- a/plugins/clirarplugin/kerfuffle_clirar.json.cmake
+++ b/plugins/clirarplugin/kerfuffle_clirar.json.cmake
@@ -1,58 +1,66 @@
{
"KPlugin": {
- "Id": "kerfuffle_clirar",
+ "Id": "kerfuffle_clirar",
"MimeTypes": [
"@SUPPORTED_MIMETYPES@"
- ],
- "Name": "RAR archive plugin",
- "Name[ca@valencia]": "Connector per arxius RAR",
- "Name[ca]": "Connector per arxius RAR",
- "Name[cs]": "Modul pro archiv RAR",
- "Name[de]": "RAR-Archiv-Modul",
- "Name[es]": "Complemento de archivo RAR",
- "Name[et]": "RAR-arhiivi plugin",
- "Name[fi]": "RAR-pakkaustuki",
- "Name[fr]": "Module externe d'archive « RAR »",
- "Name[gl]": "Complemento de arquivo RAR",
- "Name[he]": "תוסף ארכיוני RAR",
- "Name[it]": "Estensione per archivi RAR",
- "Name[nb]": "Programtillegg for RAR-arkiv",
- "Name[nl]": "RAR-archiefplug-in",
- "Name[nn]": "RAR-arkivtillegg",
- "Name[pl]": "Wtyczka archiwów RAR",
- "Name[pt]": "'Plugin' de pacotes RAR",
- "Name[pt_BR]": "Plugin de arquivos RAR",
- "Name[ru]": "Поддержка архивов RAR",
- "Name[sk]": "Modul RAR archívu",
- "Name[sl]": "Vstavek za arhive RAR",
- "Name[sr@ijekavian]": "Прикључак РАР архива",
- "Name[sr@ijekavianlatin]": "Priključak RAR arhiva",
- "Name[sr@latin]": "Priključak RAR arhiva",
- "Name[sr]": "Прикључак РАР архива",
- "Name[sv]": "Insticksprogram för RAR-arkiv",
- "Name[uk]": "Додаток для архівів RAR",
- "Name[x-test]": "xxRAR archive pluginxx",
- "Name[zh_CN]": "RAR 归档插件",
+ ],
+ "Name": "RAR archive plugin",
+ "Name[ca@valencia]": "Connector per arxius RAR",
+ "Name[ca]": "Connector per arxius RAR",
+ "Name[cs]": "Modul pro archiv RAR",
+ "Name[de]": "RAR-Archiv-Modul",
+ "Name[en_GB]": "RAR archive plugin",
+ "Name[es]": "Complemento de archivo RAR",
+ "Name[fi]": "RAR-pakkaustuki",
+ "Name[fr]": "Module externe d'archive « RAR »",
+ "Name[it]": "Estensione per archivi RAR",
+ "Name[nb]": "Programtillegg for RAR-arkiv",
+ "Name[nl]": "RAR-archiefplug-in",
+ "Name[nn]": "RAR-arkivtillegg",
+ "Name[pl]": "Wtyczka archiwów RAR",
+ "Name[pt]": "'Plugin' de pacotes RAR",
+ "Name[pt_BR]": "Plugin de arquivos RAR",
+ "Name[ru]": "Поддержка архивов RAR",
+ "Name[sk]": "Modul RAR archívu",
+ "Name[sl]": "Vstavek za arhive RAR",
+ "Name[sr@ijekavian]": "Прикључак РАР архива",
+ "Name[sr@ijekavianlatin]": "Priključak RAR arhiva",
+ "Name[sr@latin]": "Priključak RAR arhiva",
+ "Name[sr]": "Прикључак РАР архива",
+ "Name[sv]": "Insticksprogram för RAR-arkiv",
+ "Name[uk]": "Додаток для архівів RAR",
+ "Name[x-test]": "xxRAR archive pluginxx",
+ "Name[zh_CN]": "RAR 归档插件",
+ "Name[zh_TW]": "RAR 壓縮檔外掛程式",
"ServiceTypes": [
"Kerfuffle/Plugin"
- ],
+ ],
"Version": "@KDE_APPLICATIONS_VERSION@"
- },
+ },
"X-KDE-Kerfuffle-ReadOnlyExecutables": [
"unrar"
- ],
- "X-KDE-Kerfuffle-ReadWrite": true,
+ ],
+ "X-KDE-Kerfuffle-ReadWrite": true,
"X-KDE-Kerfuffle-ReadWriteExecutables": [
"rar"
- ],
- "X-KDE-Priority": 120,
+ ],
+ "X-KDE-Priority": 120,
+ "application/vnd.rar": {
+ "CompressionLevelDefault": 3,
+ "CompressionLevelMax": 5,
+ "CompressionLevelMin": 0,
+ "SupportsWriteComment": true,
+ "SupportsTesting": true,
+ "HeaderEncryption": true,
+ "SupportsMultiVolume": true
+ },
"application/x-rar": {
- "CompressionLevelDefault": 3,
- "CompressionLevelMax": 5,
- "CompressionLevelMin": 0,
- "HeaderEncryption": true,
- "SupportsMultiVolume": true,
- "SupportsTesting": true,
- "SupportsWriteComment": true
+ "CompressionLevelDefault": 3,
+ "CompressionLevelMax": 5,
+ "CompressionLevelMin": 0,
+ "SupportsWriteComment": true,
+ "SupportsTesting": true,
+ "HeaderEncryption": true,
+ "SupportsMultiVolume": true
}
-} \ No newline at end of file
+}