Commit 42913797 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 3276b221
[Desktop Entry]
Name=CoisceimPart
Name[ca]=Part del Coisceim
Name[ca@valencia]=CoisceimPart
Name[ca@valencia]=Part del Coisceim
Name[gl]=CoisceimPart
Name[nl]=CoisceimPart
Name[pl]=Moduł Coisceim
......
......@@ -30,7 +30,7 @@ Comment[uk]=Додаток Coisceim
Comment[x-test]=xxCoisceim Pluginxx
Name=Trips
Name[ca]=Viatges
Name[ca@valencia]=Trips
Name[ca@valencia]=Viatges
Name[gl]=Trips
Name[nl]=Trips
Name[pl]=Podróże
......
{
"KPlugin": {
"Name": "Merge Contacts",
"Name[ca@valencia]": "Fusiona els contactes",
"Name[ca]": "Fusiona els contactes",
"Name[gl]": "Fusionar os contactos",
"Name[nl]": "Contactpersonen samenvoegen",
......
{
"KPlugin": {
"Name": "Search Duplicate Contacts",
"Name[ca@valencia]": "Cerca els contactes duplicats",
"Name[ca]": "Cerca els contactes duplicats",
"Name[gl]": "Buscar contactos duplicados",
"Name[nl]": "Naar dubbele contactpersonen zoeken",
......
{
"KPlugin": {
"Name": "Antispam",
"Name[ca@valencia]": "Contra el correu brossa",
"Name[ca]": "Contra el correu brossa",
"Name[gl]": "Anti correo lixo",
"Name[nl]": "Antispam",
......
{
"KPlugin": {
"Name": "Antivirus",
"Name[ca@valencia]": "Contra els virus",
"Name[ca]": "Contra els virus",
"Name[gl]": "Antivirus",
"Name[nl]": "Antivirus",
......
{
"KPlugin": {
"Name": "Shorturl",
"Name[ca@valencia]": "URL curt",
"Name[ca]": "URL curt",
"Name[gl]": "Shorturl",
"Name[nl]": "Shorturl",
......
{
"KPlugin": {
"Name": "Is.gd",
"Name[ca@valencia]": "Is.gd",
"Name[ca]": "Is.gd",
"Name[gl]": "Is.gd",
"Name[nl]": "Is.gd",
......
{
"KPlugin": {
"Name": "TinyUrl",
"Name[ca@valencia]": "TinyUrl",
"Name[ca]": "TinyUrl",
"Name[gl]": "TinyUrl",
"Name[nl]": "TinyUrl",
......
{
"KPlugin": {
"Name": "to.ly",
"Name[ca@valencia]": "to.ly",
"Name[ca]": "to.ly",
"Name[gl]": "to.ly",
"Name[nl]": "to.ly",
......
{
"KPlugin": {
"Name": "Ur1Ca",
"Name[ca@valencia]": "Ur1Ca",
"Name[ca]": "Ur1Ca",
"Name[gl]": "Ur1Ca",
"Name[nl]": "Ur1Ca",
......
{
"KPlugin": {
"Name": "All Header Style",
"Name[ca@valencia]": "Tots els estils de capçalera",
"Name[ca]": "Tots els estils de capçalera",
"Name[gl]": "Estilo de cabeceira completa",
"Name[nl]": "Stijl met alle headers",
......
{
"KPlugin": {
"Name": "Brief Header Style",
"Name[ca@valencia]": "Estil de capçalera breu",
"Name[ca]": "Estil de capçalera breu",
"Name[gl]": "Estilo de cabeceira resumida",
"Name[nl]": "Stijl met gering aantal headers",
......
{
"KPlugin": {
"Name": "Custom Header Style",
"Name[ca@valencia]": "Estil de capçalera personalitzada",
"Name[ca]": "Estil de capçalera personalitzada",
"Name[gl]": "Estilo de cabeceira personalizada",
"Name[nl]": "Stijl met aangepast aantal headers",
......
{
"KPlugin": {
"Name": "Enterprise Header Style",
"Name[ca@valencia]": "Estil de capçalera corporativa",
"Name[ca]": "Estil de capçalera corporativa",
"Name[gl]": "Estilo de cabeceira de empresa",
"Name[nl]": "Stijl met headers van de onderneming",
......
{
"KPlugin": {
"Name": "Fancy Header Style",
"Name[ca@valencia]": "Estil de capçalera sofisticada",
"Name[ca]": "Estil de capçalera sofisticada",
"Name[gl]": "Estilo de cabeceira moderno",
"Name[nl]": "Stijl met elegante headers",
......
{
"KPlugin": {
"Name": "Grantlee Header Style",
"Name[ca@valencia]": "Estil de capçalera «Grantlee»",
"Name[ca]": "Estil de capçalera «Grantlee»",
"Name[gl]": "Estilo de cabeceira de Grantlee",
"Name[nl]": "Stijl met Grantlee headers",
......
{
"KPlugin": {
"Name": "Long Header Style",
"Name[ca@valencia]": "Estil de capçalera llarga",
"Name[ca]": "Estil de capçalera llarga",
"Name[gl]": "Estilo de cabeceira longa",
"Name[nl]": "Stijl met lange headers",
......
{
"KPlugin": {
"Name": "Standards Header Style",
"Name[ca@valencia]": "Estil de capçalera estàndard",
"Name[ca]": "Estil de capçalera estàndard",
"Name[gl]": "Estilo de cabeceira estándar",
"Name[nl]": "Stijl met standaard headers",
......
{
"KPlugin": {
"Name": "box",
"Name[ca]": "box",
"Name[nl]": "box",
"Name[pt]": "box",
"Name[pt_BR]": "Box",
"Name[sv]": "låda",
"Name[uk]": "box",
"Name[x-test]": "xxboxxx",
"Name": "box",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
}
}
}
\ No newline at end of file
{
"KPlugin": {
"Name": "DropBox",
"Name[ca]": "DropBox",
"Name[nl]": "DropBox",
"Name[pt]": "DropBox",
"Name[pt_BR]": "DropBox",
"Name[sv]": "Dropbox",
"Name[uk]": "DropBox",
"Name[x-test]": "xxDropBoxxx",
"Name": "DropBox",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
}
}
}
\ No newline at end of file
{
"KPlugin": {
"Name": "GDrive",
"Name[ca]": "GDrive",
"Name[nl]": "GDrive",
"Name[pt]": "GDrive",
"Name[pt_BR]": "GDrive",
"Name[sv]": "GDrive",
"Name[uk]": "GDrive",
"Name[x-test]": "xxGDrivexx",
"Name": "GDrive",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
}
}
}
\ No newline at end of file
{
"KPlugin": {
"Name": "Hubic",
"Name[ca]": "Hubic",
"Name[nl]": "Hubic",
"Name[pt]": "Hubic",
"Name[pt_BR]": "Hubic",
"Name[sv]": "Hubic",
"Name[uk]": "Hubic",
"Name[x-test]": "xxHubicxx",
"Name": "Hubic",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
}
}
}
\ No newline at end of file
{
"KPlugin": {
"Name": "Webdav",
"Name[ca]": "Webdav",
"Name[nl]": "Webdav",
"Name[pt]": "WebDAV",
"Name[pt_BR]": "Webdav",
"Name[sv]": "WebDAV",
"Name[uk]": "Webdav",
"Name[x-test]": "xxWebdavxx",
"Name": "Webdav",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
}
}
}
\ No newline at end of file
{
"KPlugin": {
"Name": "YouSendIt",
"Name[ca]": "YouSendIt",
"Name[nl]": "YouSendIt",
"Name[pt]": "YouSendIt",
"Name[pt_BR]": "YouSendIt",
"Name[sv]": "YouSendIt",
"Name[uk]": "YouSendIt",
"Name[x-test]": "xxYouSendItxx",
"Name": "YouSendIt",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
}
}
}
\ 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