Commit 6b5739b6 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent a2107564
......@@ -12,7 +12,7 @@
"Name[es]": "Complemento de archivo 7zip",
"Name[et]": "7zip arhiivi plugin",
"Name[fi]": "7zip-pakkaustuki",
"Name[fr]": "Module externe d'archive « 7zip »",
"Name[fr]": "Module externe d'archive « 7zip »",
"Name[gl]": "Complemento de arquivo de 7zip",
"Name[he]": "תוסף ארכיוני 7zip",
"Name[it]": "Estensione per archivi 7zip",
......@@ -50,34 +50,34 @@
"CompressionLevelDefault": 5,
"CompressionLevelMax": 9,
"CompressionLevelMin": 0,
"HeaderEncryption": true,
"SupportsMultiVolume": true,
"SupportsTesting": true,
"CompressionMethodDefault": "LZMA2",
"CompressionMethods": [
"BZip2",
"Copy",
"Deflate",
"LZMA",
"LZMA2",
"BZip2",
"Copy",
"Deflate",
"LZMA",
"LZMA2",
"PPMd"
],
"CompressionMethodDefault": "LZMA2"
],
"HeaderEncryption": true,
"SupportsMultiVolume": true,
"SupportsTesting": true
},
"application/zip": {
"CompressionLevelDefault": 5,
"CompressionLevelMax": 9,
"CompressionLevelMin": 0,
"Encryption": true,
"SupportsMultiVolume": true,
"SupportsTesting": true,
"CompressionMethodDefault": "Deflate",
"CompressionMethods": [
"BZip2",
"Copy",
"Deflate",
"Deflate64",
"LZMA",
"BZip2",
"Copy",
"Deflate",
"Deflate64",
"LZMA",
"PPMd"
],
"CompressionMethodDefault": "Deflate"
],
"Encryption": true,
"SupportsMultiVolume": true,
"SupportsTesting": true
}
}
}
\ No newline at end of file
......@@ -12,7 +12,7 @@
"Name[es]": "Complemento de archivo RAR",
"Name[et]": "RAR-arhiivi plugin",
"Name[fi]": "RAR-pakkaustuki",
"Name[fr]": "Module externe d'archive « RAR »",
"Name[fr]": "Module externe d'archive « RAR »",
"Name[gl]": "Complemento de arquivo RAR",
"Name[he]": "תוסף ארכיוני RAR",
"Name[it]": "Estensione per archivi RAR",
......@@ -51,28 +51,28 @@
"CompressionLevelDefault": 3,
"CompressionLevelMax": 5,
"CompressionLevelMin": 0,
"CompressionMethodDefault": "RAR4",
"CompressionMethods": [
"RAR4",
"RAR5"
],
"HeaderEncryption": true,
"SupportsMultiVolume": true,
"SupportsTesting": true,
"SupportsWriteComment": true,
"CompressionMethods": [
"RAR4",
"RAR5"
],
"CompressionMethodDefault": "RAR4"
"SupportsWriteComment": true
},
"application/x-rar": {
"CompressionLevelDefault": 3,
"CompressionLevelMax": 5,
"CompressionLevelMin": 0,
"CompressionMethodDefault": "RAR4",
"CompressionMethods": [
"RAR4",
"RAR5"
],
"HeaderEncryption": true,
"SupportsMultiVolume": true,
"SupportsTesting": true,
"SupportsWriteComment": true,
"CompressionMethods": [
"RAR4",
"RAR5"
],
"CompressionMethodDefault": "RAR4"
"SupportsWriteComment": true
}
}
}
\ No newline at end of file
......@@ -12,7 +12,7 @@
"Name[es]": "Complemento de archivo ZIP",
"Name[et]": "ZIP-arhiivi plugin",
"Name[fi]": "ZIP-pakkaustuki",
"Name[fr]": "Module externe d'archive « zip »",
"Name[fr]": "Module externe d'archive « zip »",
"Name[gl]": "Complemento de arquivo ZIP",
"Name[he]": "תוסף ארכיוני ZIP",
"Name[it]": "Estensione per archivi ZIP",
......@@ -58,13 +58,13 @@
"CompressionLevelDefault": 6,
"CompressionLevelMax": 9,
"CompressionLevelMin": 0,
"Encryption": true,
"SupportsTesting": true,
"CompressionMethodDefault": "deflate",
"CompressionMethods": [
"BZip2",
"Deflate",
"BZip2",
"Deflate",
"Store"
],
"CompressionMethodDefault": "deflate"
],
"Encryption": true,
"SupportsTesting": true
}
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment