Commit eaea47be 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 1b0e6e08
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Comprova el «Gravatar»",
"Name[ca]": "Comprova el «Gravatar»",
"Name[de]": "Gravatar überprüfen",
"Name[en_GB]": "Check Gravatar",
"Name[es]": "Comprobar Gravatar",
"Name[fi]": "Tarkista Gravatar",
"Name[gl]": "Comprobar en Gravatar",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Fusiona els contactes",
"Name[ca]": "Fusiona els contactes",
"Name[de]": "Kontakte zusammenführen",
"Name[en_GB]": "Merge Contacts",
"Name[es]": "Mezclar contactos",
"Name[fi]": "Yhdistä yhteystiedot",
"Name[gl]": "Fusionar os contactos",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Cerca els contactes duplicats",
"Name[ca]": "Cerca els contactes duplicats",
"Name[de]": "Doppelte Kontakte suchen",
"Name[en_GB]": "Search Duplicate Contacts",
"Name[es]": "Buscar contactos duplicados",
"Name[fi]": "Etsi monisteisia yhteystietoja",
"Name[gl]": "Buscar contactos duplicados",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Envia el correu",
"Name[ca]": "Envia el correu",
"Name[de]": "E-Mail versenden",
"Name[en_GB]": "Send Mail",
"Name[es]": "Enviar correo",
"Name[fi]": "Lähetä sähköpostia",
"Name[gl]": "Enviar correo",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Envia unes quantes vCard",
"Name[ca]": "Envia unes quantes vCard",
"Name[de]": "vCards senden",
"Name[en_GB]": "Send Vcards",
"Name[es]": "Enviar Vcards",
"Name[fi]": "Lähetä vCardeja",
"Name[gl]": "Enviar vCards",
......
{
"KPlugin": {
"Name": "Rot13",
"Name[ca@valencia]": "Rot13",
"Name[ca]": "Rot13",
"Name[nl]": "Rot13",
"Name[pl]": "Rot13",
"Name[pt]": "Rot13",
"Name[pt_BR]": "Rot13",
"Name[sk]": "Rot13",
"Name[sr@ijekavian]": "Рот‑13",
"Name[sr@ijekavianlatin]": "Rot‑13",
"Name[sr@latin]": "Rot‑13",
......
......@@ -4,15 +4,11 @@
"Name[ca@valencia]": "Contra el correu brossa",
"Name[ca]": "Contra el correu brossa",
"Name[de]": "Anti-Spam",
"Name[en_GB]": "Antispam",
"Name[es]": "Anti correo basura",
"Name[fi]": "Roskapostin suodatus",
"Name[gl]": "Anti correo lixo",
"Name[nl]": "Antispam",
"Name[pl]": "Antyspam",
"Name[pt]": "Anti-Lixo Electrónico",
"Name[pt_BR]": "Antispam",
"Name[sk]": "Antispam",
"Name[sr@ijekavian]": "Противспам",
"Name[sr@ijekavianlatin]": "Protivspam",
"Name[sr@latin]": "Protivspam",
......
......@@ -4,11 +4,7 @@
"Name[ca@valencia]": "Contra els virus",
"Name[ca]": "Contra els virus",
"Name[de]": "Anti-Virus",
"Name[en_GB]": "Antivirus",
"Name[es]": "Antivirus",
"Name[fi]": "Virusten suodatus",
"Name[gl]": "Antivirus",
"Name[nl]": "Antivirus",
"Name[pl]": "Antywirus",
"Name[pt]": "Anti-Vírus",
"Name[pt_BR]": "Antivírus",
......@@ -17,7 +13,6 @@
"Name[sr@ijekavianlatin]": "Protivvirusni",
"Name[sr@latin]": "Protivvirusni",
"Name[sr]": "Противвирусни",
"Name[sv]": "Antivirus",
"Name[uk]": "Антивірус",
"Name[x-test]": "xxAntivirusxx",
"ServiceTypes": [
......
......@@ -3,15 +3,10 @@
"Name": "Shorturl",
"Name[ca@valencia]": "URL curt",
"Name[ca]": "URL curt",
"Name[en_GB]": "Shorturl",
"Name[es]": "Shorturl",
"Name[fi]": "Lyhytosoite",
"Name[gl]": "Shorturl",
"Name[nl]": "Shorturl",
"Name[pl]": "Krótki adres URL",
"Name[pt]": "URL Curto",
"Name[pt_BR]": "URL curta",
"Name[sk]": "Shorturl",
"Name[sr@ijekavian]": "Скраћени УРЛ",
"Name[sr@ijekavianlatin]": "Skraćeni URL",
"Name[sr@latin]": "Skraćeni URL",
......
{
"KPlugin": {
"Name": "Is.gd",
"Name[ca@valencia]": "Is.gd",
"Name[ca]": "Is.gd",
"Name[de]": "Is.gd",
"Name[en_GB]": "Is.gd",
"Name[es]": "Is.gd",
"Name[fi]": "Is.gd",
"Name[gl]": "Is.gd",
"Name[nl]": "Is.gd",
"Name[pl]": "Is.gd",
"Name[pt]": "Is.gd",
"Name[pt_BR]": "Is.gd",
"Name[sk]": "Is.gd",
"Name[sr@ijekavian]": "ИзГд",
"Name[sr@ijekavianlatin]": "IsGd",
"Name[sr@latin]": "IsGd",
"Name[sr]": "ИзГд",
"Name[sv]": "Is.gd",
"Name[uk]": "Is.gd",
"Name[x-test]": "xxIs.gdxx",
"Name[zh_CN]": "Is.gd",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "TinyUrl",
"Name[ca@valencia]": "TinyUrl",
"Name[ca]": "TinyUrl",
"Name[de]": "TinyUrl",
"Name[en_GB]": "TinyUrl",
"Name[es]": "TinyUrl",
"Name[fi]": "TinyUrl",
"Name[gl]": "TinyUrl",
"Name[nl]": "TinyUrl",
"Name[pl]": "TinyUrl",
"Name[pt]": "TinyUrl",
"Name[pt_BR]": "TinyUrl",
"Name[sk]": "TinyUrl",
"Name[sr@ijekavian]": "ТајниУРЛ",
"Name[sr@ijekavianlatin]": "TinyURL",
"Name[sr@latin]": "TinyURL",
"Name[sr]": "ТајниУРЛ",
"Name[sv]": "TinyUrl",
"Name[uk]": "TinyUrl",
"Name[x-test]": "xxTinyUrlxx",
"Name[zh_CN]": "TinyUrl",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "to.ly",
"Name[ca@valencia]": "to.ly",
"Name[ca]": "to.ly",
"Name[de]": "to.ly",
"Name[en_GB]": "to.ly",
"Name[es]": "to.ly",
"Name[fi]": "to.ly",
"Name[gl]": "to.ly",
"Name[nl]": "to.ly",
"Name[pl]": "to.ly",
"Name[pt]": "to.ly",
"Name[pt_BR]": "to.ly",
"Name[sk]": "to.ly",
"Name[sr@ijekavian]": "То.ли",
"Name[sr@ijekavianlatin]": "to.ly",
"Name[sr@latin]": "to.ly",
"Name[sr]": "То.ли",
"Name[sv]": "to.ly",
"Name[uk]": "to.ly",
"Name[x-test]": "xxto.lyxx",
"Name[zh_CN]": "to.ly",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
{
"KPlugin": {
"Name": "Ur1Ca",
"Name[ca@valencia]": "Ur1Ca",
"Name[ca]": "Ur1Ca",
"Name[de]": "Ur1Ca",
"Name[en_GB]": "Ur1Ca",
"Name[es]": "Ur1Ca",
"Name[fi]": "Ur1Ca",
"Name[gl]": "Ur1Ca",
"Name[nl]": "Ur1Ca",
"Name[pl]": "Ur1Ca",
"Name[pt]": "Ur1Ca",
"Name[pt_BR]": "Ur1Ca",
"Name[sk]": "Ur1Ca",
"Name[sr@ijekavian]": "Ур1.ца",
"Name[sr@ijekavianlatin]": "Ur1.ca",
"Name[sr@latin]": "Ur1.ca",
"Name[sr]": "Ур1.ца",
"Name[sv]": "Ur1Ca",
"Name[uk]": "Ur1Ca",
"Name[x-test]": "xxUr1Caxx",
"Name[zh_CN]": "Ur1Ca",
"ServiceTypes": [
"PimCommonShortUrlEngine/Plugin"
],
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Traductor",
"Name[ca]": "Traductor",
"Name[de]": "Übersetzer",
"Name[en_GB]": "Translator",
"Name[es]": "Traductor",
"Name[fi]": "Käännösohjelma",
"Name[gl]": "Tradutor",
......
......@@ -3,7 +3,6 @@
"Name": "All Header Style",
"Name[ca@valencia]": "Tots els estils de capçalera",
"Name[ca]": "Tots els estils de capçalera",
"Name[en_GB]": "All Header Style",
"Name[es]": "Todos los estilos de encabezado",
"Name[fi]": "Kaikki otsakkeet -tyyli",
"Name[gl]": "Estilo de cabeceira completa",
......
......@@ -3,7 +3,6 @@
"Name": "Brief Header Style",
"Name[ca@valencia]": "Estil de capçalera breu",
"Name[ca]": "Estil de capçalera breu",
"Name[en_GB]": "Brief Header Style",
"Name[es]": "Estilo de encabezado breve",
"Name[fi]": "Lyhyt otsaketyyli",
"Name[gl]": "Estilo de cabeceira resumida",
......
......@@ -3,7 +3,6 @@
"Name": "Custom Header Style",
"Name[ca@valencia]": "Estil de capçalera personalitzada",
"Name[ca]": "Estil de capçalera personalitzada",
"Name[en_GB]": "Custom Header Style",
"Name[es]": "Estilo de encabezado personalizado",
"Name[fi]": "Mukautettu otsaketyyli",
"Name[gl]": "Estilo de cabeceira personalizada",
......
......@@ -3,7 +3,6 @@
"Name": "Enterprise Header Style",
"Name[ca@valencia]": "Estil de capçalera corporativa",
"Name[ca]": "Estil de capçalera corporativa",
"Name[en_GB]": "Enterprise Header Style",
"Name[es]": "Estilo de encabezado empresarial",
"Name[fi]": "Yritysotsakkeiden tyyli",
"Name[gl]": "Estilo de cabeceira de empresa",
......
......@@ -3,7 +3,6 @@
"Name": "Fancy Header Style",
"Name[ca@valencia]": "Estil de capçalera sofisticada",
"Name[ca]": "Estil de capçalera sofisticada",
"Name[en_GB]": "Fancy Header Style",
"Name[es]": "Estilo de encabezado elegante",
"Name[fi]": "Tyylikäs otsaketyyli",
"Name[gl]": "Estilo de cabeceira moderno",
......
......@@ -3,7 +3,6 @@
"Name": "Grantlee Header Style",
"Name[ca@valencia]": "Estil de capçalera «Grantlee»",
"Name[ca]": "Estil de capçalera «Grantlee»",
"Name[en_GB]": "Grantlee Header Style",
"Name[es]": "Estilo de encabezado Grantlee",
"Name[fi]": "Grantlee-otsaketyyli",
"Name[gl]": "Estilo de cabeceira de Grantlee",
......
......@@ -3,7 +3,6 @@
"Name": "Long Header Style",
"Name[ca@valencia]": "Estil de capçalera llarga",
"Name[ca]": "Estil de capçalera llarga",
"Name[en_GB]": "Long Header Style",
"Name[es]": "Estilo de encabezado grande",
"Name[fi]": "Pitkä otsaketyyli",
"Name[gl]": "Estilo de cabeceira longa",
......
......@@ -3,7 +3,6 @@
"Name": "Standards Header Style",
"Name[ca@valencia]": "Estil de capçalera estàndard",
"Name[ca]": "Estil de capçalera estàndard",
"Name[en_GB]": "Standards Header Style",
"Name[es]": "Estilo de encabezado estándar",
"Name[fi]": "Vakio-otsaketyyli",
"Name[gl]": "Estilo de cabeceira estándar",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Crea un esdeveniment",
"Name[ca]": "Crea un esdeveniment",
"Name[de]": "Ereignis erstellen",
"Name[en_GB]": "Create Event",
"Name[es]": "Crear evento",
"Name[fi]": "Luo tapahtuma",
"Name[gl]": "Crear un acontecemento",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Crea una nota",
"Name[ca]": "Crea una nota",
"Name[de]": "Notiz erstellen",
"Name[en_GB]": "Create Note",
"Name[es]": "Crear nota",
"Name[fi]": "Luo muistiinpano",
"Name[gl]": "Crear unha nota",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Crea una pendent",
"Name[ca]": "Crea una pendent",
"Name[de]": "Aufgabe erstellen",
"Name[en_GB]": "Create Todo",
"Name[es]": "Crear tarea pendiente",
"Name[fi]": "Luo tehtävä",
"Name[gl]": "Crear unha tarefa pendente",
......
......@@ -4,7 +4,6 @@
"Name[ca@valencia]": "Traductor",
"Name[ca]": "Traductor",
"Name[de]": "Übersetzer",
"Name[en_GB]": "Translator",
"Name[es]": "Traductor",
"Name[fi]": "Käännösohjelma",
"Name[gl]": "Tradutor",
......
{
"KPlugin": {
"Name": "box",
"Name[ca@valencia]": "box",
"Name[ca]": "box",
"Name[en_GB]": "box",
"Name[es]": "caja",
"Name[fi]": "box",
"Name[gl]": "box",
"Name[nl]": "box",
"Name[pl]": "pudełko",
"Name[pt]": "Box",
"Name[pt_BR]": "Box",
"Name[sk]": "box",
"Name[sr@ijekavian]": "Бокс",
"Name[sr@ijekavianlatin]": "Box",
"Name[sr@latin]": "Box",
"Name[sr]": "Бокс",
"Name[sv]": "låda",
"Name[uk]": "box",
"Name[x-test]": "xxboxxx",
"Name[zh_CN]": "box",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
......
{
"KPlugin": {
"Name": "DropBox",
"Name[ca@valencia]": "DropBox",
"Name[ca]": "DropBox",
"Name[de]": "DropBox",
"Name[en_GB]": "DropBox",
"Name[es]": "DropBox",
"Name[fi]": "DropBox",
"Name[gl]": "DropBox",
"Name[nl]": "DropBox",
"Name[pl]": "DropBox",
"Name[pt]": "DropBox",
"Name[pt_BR]": "DropBox",
"Name[sk]": "Dropbox",
"Name[sr@ijekavian]": "Дропбокс",
"Name[sr@ijekavianlatin]": "Dropbox",
"Name[sr@latin]": "Dropbox",
"Name[sr]": "Дропбокс",
"Name[sv]": "Dropbox",
"Name[uk]": "DropBox",
"Name[x-test]": "xxDropBoxxx",
"Name[zh_CN]": "DropBox",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
......
{
"KPlugin": {
"Name": "GDrive",
"Name[ca@valencia]": "GDrive",
"Name[ca]": "GDrive",
"Name[de]": "GDrive",
"Name[en_GB]": "GDrive",
"Name[es]": "GDrive",
"Name[fi]": "GDrive",
"Name[gl]": "GDrive",
"Name[nl]": "GDrive",
"Name[pl]": "GDrive",
"Name[pt]": "GDrive",
"Name[pt_BR]": "GDrive",
"Name[sk]": "GDrive",
"Name[sr@ijekavian]": "Гугл‑драјв",
"Name[sr@ijekavianlatin]": "Google Drive",
"Name[sr@latin]": "Google Drive",
"Name[sr]": "Гугл‑драјв",
"Name[sv]": "GDrive",
"Name[uk]": "GDrive",
"Name[x-test]": "xxGDrivexx",
"Name[zh_CN]": "GDrive",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
......
{
"KPlugin": {
"Name": "Hubic",
"Name[ca@valencia]": "Hubic",
"Name[ca]": "Hubic",
"Name[de]": "Hubic",
"Name[en_GB]": "Hubic",
"Name[es]": "Hubic",
"Name[fi]": "Hubic",
"Name[gl]": "Hubic",
"Name[nl]": "Hubic",
"Name[pl]": "Hubic",
"Name[pt]": "Hubic",
"Name[pt_BR]": "Hubic",
"Name[sk]": "Hubic",
"Name[sr@ijekavian]": "Хјубик",
"Name[sr@ijekavianlatin]": "hubiC",
"Name[sr@latin]": "hubiC",
"Name[sr]": "Хјубик",
"Name[sv]": "Hubic",
"Name[uk]": "Hubic",
"Name[x-test]": "xxHubicxx",
"Name[zh_CN]": "Hubic",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
......
{
"KPlugin": {
"Name": "Webdav",
"Name[ca@valencia]": "Webdav",
"Name[ca]": "Webdav",
"Name[de]": "WebDAV",
"Name[en_GB]": "Webdav",
"Name[es]": "Webdav",
"Name[fi]": "Webdav",
"Name[gl]": "Webdav",
"Name[nl]": "Webdav",
"Name[pl]": "Webdav",
"Name[pt]": "WebDAV",
"Name[pt_BR]": "Webdav",
"Name[sk]": "Webdav",
"Name[sr@ijekavian]": "вебДАВ",
"Name[sr@ijekavianlatin]": "WebDAV",
"Name[sr@latin]": "WebDAV",
"Name[sr]": "вебДАВ",
"Name[sv]": "WebDAV",
"Name[uk]": "Webdav",
"Name[x-test]": "xxWebdavxx",
"Name[zh_CN]": "Webdav",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
......
{
"KPlugin": {
"Name": "YouSendIt",
"Name[ca@valencia]": "YouSendIt",
"Name[ca]": "YouSendIt",
"Name[de]": "YouSendIt",
"Name[en_GB]": "YouSendIt",
"Name[es]": "YouSendIt",
"Name[fi]": "YouSendIt",
"Name[gl]": "YouSendIt",
"Name[nl]": "YouSendIt",
"Name[pl]": "YouSendIt",
"Name[pt]": "YouSendIt",
"Name[pt_BR]": "YouSendIt",
"Name[sk]": "YouSendIt",
"Name[sr@ijekavian]": "Јусендит",
"Name[sr@ijekavianlatin]": "YouSendIt",
"Name[sr@latin]": "YouSendIt",
"Name[sr]": "Јусендит",
"Name[sv]": "YouSendIt",
"Name[uk]": "YouSendIt",
"Name[x-test]": "xxYouSendItxx",
"Name[zh_CN]": "YouSendIt",
"ServiceTypes": [
"PimCommonStorageService/Plugin"
]
......
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