Commit 2b80d502 authored by Script Kiddy's avatar Script Kiddy

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 a9b28c0d
......@@ -6,4 +6,4 @@
],
"Version": "1.0"
}
}
}
\ No newline at end of file
......@@ -6,4 +6,4 @@
],
"Version": "1.0"
}
}
}
\ No newline at end of file
{
"KPlugin": {
"Name": "Antispam",
"Name[gl]": "Anti correo lixo",
"Name[nl]": "Antispam",
"Name[pt]": "Anti-Lixo Electrónico",
"Name[sv]": "Antiskräppost",
"Name[uk]": "Антиспам",
"Name[x-test]": "xxAntispamxx",
"ServiceTypes": [
"KMail/MainViewPlugin"
],
......
{
"KPlugin": {
"Name": "Antivirus",
"Name[gl]": "Antivirus",
"Name[nl]": "Antivirus",
"Name[pt]": "Anti-Vírus",
"Name[sv]": "Antivirus",
"Name[uk]": "Антивірус",
"Name[x-test]": "xxAntivirusxx",
"ServiceTypes": [
"KMail/MainViewPlugin"
],
......
{
"KPlugin": {
"Name": "Shorturl",
"Name[gl]": "Shorturl",
"Name[nl]": "Shorturl",
"Name[pt]": "URL Curto",
"Name[pt_BR]": "URL curta",
......
{
"KPlugin": {
"Name": "Is.gd",
"Name[gl]": "Is.gd",
"Name[nl]": "Is.gd",
"Name[pt]": "Is.gd",
"Name[sv]": "Is.gd",
"Name[uk]": "Is.gd",
"Name[x-test]": "xxIs.gdxx",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "TinyUrl",
"Name[gl]": "TinyUrl",
"Name[nl]": "TinyUrl",
"Name[pt]": "TinyUrl",
"Name[sv]": "TinyUrl",
"Name[uk]": "TinyUrl",
"Name[x-test]": "xxTinyUrlxx",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "to.ly",
"Name[gl]": "to.ly",
"Name[nl]": "to.ly",
"Name[pt]": "to.ly",
"Name[sv]": "to.ly",
"Name[uk]": "to.ly",
"Name[x-test]": "xxto.lyxx",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "Ur1Ca",
"Name[gl]": "Ur1Ca",
"Name[nl]": "Ur1Ca",
"Name[pt]": "Ur1Ca",
"Name[sv]": "Ur1Ca",
"Name[uk]": "Ur1Ca",
"Name[x-test]": "xxUr1Caxx",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "All Header Style",
"Name[gl]": "Estilo de cabeceira completa",
"Name[nl]": "Stijl met alle headers",
"Name[pt]": "Estilo de Cabeçalho Completo",
"Name[pt_BR]": "Estilo com todos os cabeçalhos",
......
{
"KPlugin": {
"Name": "Brief Header Style",
"Name[gl]": "Estilo de cabeceira resumida",
"Name[nl]": "Stijl met gering aantal headers",
"Name[pt]": "Estilo de Cabeçalho Resumido",
"Name[pt_BR]": "Estilo de cabeçalho Reduzido",
......
{
"KPlugin": {
"Name": "Custom Header Style",
"Name[gl]": "Estilo de cabeceira personalizada",
"Name[nl]": "Stijl met aangepast aantal headers",
"Name[pt]": "Estilo de Cabeçalho Personalizado",
"Name[pt_BR]": "Estilo de cabeçalho Personalizado",
......
{
"KPlugin": {
"Name": "Enterprise Header Style",
"Name[gl]": "Estilo de cabeceira de empresa",
"Name[nl]": "Stijl met headers van de onderneming",
"Name[pt]": "Estilo de Cabeçalho Empresarial",
"Name[pt_BR]": "Estilo de cabeçalho Empresarial",
......
{
"KPlugin": {
"Name": "Fancy Header Style",
"Name[gl]": "Estilo de cabeceira moderno",
"Name[nl]": "Stijl met elegante headers",
"Name[pt]": "Estilo de Cabeçalho Bonito",
"Name[pt_BR]": "Estilo de cabeçalho Bonito",
......
{
"KPlugin": {
"Name": "Grantlee Header Style",
"Name[gl]": "Estilo de cabeceira de Grantlee",
"Name[nl]": "Stijl met Grantlee headers",
"Name[pt]": "Estilo de Cabeçalho do Grantlee",
"Name[pt_BR]": "Estilo de cabeçalho Grantlee",
......
{
"KPlugin": {
"Name": "Long Header Style",
"Name[gl]": "Estilo de cabeceira longa",
"Name[nl]": "Stijl met lange headers",
"Name[pt]": "Estilo de Cabeçalho Longo",
"Name[pt_BR]": "Estilo de cabeçalho Extenso",
......
{
"KPlugin": {
"Name": "Standards Header Style",
"Name[gl]": "Estilo de cabeceira estándar",
"Name[nl]": "Stijl met standaard headers",
"Name[pt]": "Estilo de Cabeçalho-Padrão",
"Name[pt_BR]": "Estilo de cabeçalho Padrão",
......
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