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"
This commit is contained in:
l10n daemon script 2016-09-14 09:18:35 +00:00
parent 8f980541f5
commit 861f1c982a
5 changed files with 176 additions and 40 deletions

View File

@ -2,14 +2,41 @@
"KPlugin": {
"Authors": [
{
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo"
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[sr@ijekavian]": "Арон Џ. Сајго",
"Name[sr@ijekavianlatin]": "Aron Dž. Sajgo",
"Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго",
"Name[x-test]": "xxAaron Seigoxx"
}
],
"Id": "Plasma/ContainmentActions",
"Name": "Containment Actions",
"ServiceTypes": [ "KPackage/PackageStructure" ],
],
"Id": "Plasma/ContainmentActions",
"Name": "Containment Actions",
"Name[ca@valencia]": "Accions del contenidor",
"Name[ca]": "Accions del contenidor",
"Name[da]": "Beholder-handlinger",
"Name[es]": "Acciones del contenedor",
"Name[et]": "Konteineritoimingud",
"Name[it]": "Azioni dei contenitori",
"Name[nl]": "Containeracties",
"Name[pl]": "Działania pojemnika",
"Name[pt]": "Acções do Contentor",
"Name[ru]": "Действия для контейнера Plasma",
"Name[sk]": "Akcie obsahu",
"Name[sl]": "Dejanja vsebnikov",
"Name[sr@ijekavian]": "Радње садржаоца",
"Name[sr@ijekavianlatin]": "Radnje sadržaoca",
"Name[sr@latin]": "Radnje sadržaoca",
"Name[sr]": "Радње садржаоца",
"Name[sv]": "Omgivningsåtgärder",
"Name[uk]": "Дії з контейнерами",
"Name[x-test]": "xxContainment Actionsxx",
"Name[zh_CN]": "容器动作",
"ServiceTypes": [
"KPackage/PackageStructure"
],
"Version": "1"
},
},
"X-KDE-ParentApp": "org.kde.plasmashell"
}
}

View File

@ -2,14 +2,43 @@
"KPlugin": {
"Authors": [
{
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo"
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[sr@ijekavian]": "Арон Џ. Сајго",
"Name[sr@ijekavianlatin]": "Aron Dž. Sajgo",
"Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго",
"Name[x-test]": "xxAaron Seigoxx"
}
],
"Id": "Plasma/DataEngine",
"Name": "Data Engine",
"ServiceTypes": [ "KPackage/PackageStructure" ],
],
"Id": "Plasma/DataEngine",
"Name": "Data Engine",
"Name[ca@valencia]": "Motor de dades",
"Name[ca]": "Motor de dades",
"Name[cs]": "Datový nástroj",
"Name[da]": "Datamotor",
"Name[de]": "Datenmodul",
"Name[es]": "Motor de datos",
"Name[et]": "Andmemootor",
"Name[it]": "Motore dati",
"Name[nl]": "Gegevensengine",
"Name[pl]": "Silnik danych",
"Name[pt]": "Motor de Dados",
"Name[ru]": "Источник данных Plasma",
"Name[sk]": "Dátový nástroj",
"Name[sl]": "Podatkovni pogon",
"Name[sr@ijekavian]": "Датомотор",
"Name[sr@ijekavianlatin]": "Datomotor",
"Name[sr@latin]": "Datomotor",
"Name[sr]": "Датомотор",
"Name[sv]": "Datagränssnitt",
"Name[uk]": "Рушій даних",
"Name[x-test]": "xxData Enginexx",
"Name[zh_CN]": "数据引擎",
"ServiceTypes": [
"KPackage/PackageStructure"
],
"Version": "1"
},
},
"X-KDE-ParentApp": "org.kde.plasmashell"
}
}

View File

@ -2,14 +2,44 @@
"KPlugin": {
"Authors": [
{
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo"
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[sr@ijekavian]": "Арон Џ. Сајго",
"Name[sr@ijekavianlatin]": "Aron Dž. Sajgo",
"Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго",
"Name[x-test]": "xxAaron Seigoxx"
}
],
"Id": "Plasma/Generic",
"Name": "Generic",
"ServiceTypes": [ "KPackage/PackageStructure" ],
],
"Id": "Plasma/Generic",
"Name": "Generic",
"Name[ca@valencia]": "Genèric",
"Name[ca]": "Genèric",
"Name[cs]": "Obecné",
"Name[da]": "Generisk",
"Name[de]": "Generisch",
"Name[es]": "General",
"Name[et]": "Üldine",
"Name[it]": "Generico",
"Name[nl]": "Algemeen",
"Name[pl]": "Ogólne",
"Name[pt]": "Genérico",
"Name[pt_BR]": "Genérico",
"Name[ru]": "Пакет Plasma общего назначения",
"Name[sk]": "Všeobecné",
"Name[sl]": "Splošno",
"Name[sr@ijekavian]": "Генерички",
"Name[sr@ijekavianlatin]": "Generički",
"Name[sr@latin]": "Generički",
"Name[sr]": "Генерички",
"Name[sv]": "Generella",
"Name[uk]": "Загальний",
"Name[x-test]": "xxGenericxx",
"Name[zh_CN]": "常规",
"ServiceTypes": [
"KPackage/PackageStructure"
],
"Version": "1"
},
},
"X-KDE-ParentApp": "org.kde.plasmashell"
}
}

View File

@ -2,14 +2,43 @@
"KPlugin": {
"Authors": [
{
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo"
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[sr@ijekavian]": "Арон Џ. Сајго",
"Name[sr@ijekavianlatin]": "Aron Dž. Sajgo",
"Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго",
"Name[x-test]": "xxAaron Seigoxx"
}
],
"Id": "Plasma/Theme",
"Name": "Plasma Theme",
"ServiceTypes": [ "KPackage/PackageStructure" ],
],
"Id": "Plasma/Theme",
"Name": "Plasma Theme",
"Name[ca@valencia]": "Tema del Plasma",
"Name[ca]": "Tema del Plasma",
"Name[cs]": "Motiv Plasma",
"Name[da]": "Plasma-tema",
"Name[de]": "Plasma-Design",
"Name[es]": "Tema de Plasma",
"Name[et]": "Plasma teema",
"Name[it]": "Tema di Plasma",
"Name[nl]": "Plasma-thema",
"Name[pl]": "Wystrój Plazmy",
"Name[pt]": "Tema do Plasma",
"Name[ru]": "Тема оформления Plasma",
"Name[sk]": "Téma Plasmy",
"Name[sl]": "Tema za Plasmo",
"Name[sr@ijekavian]": "Плазма тема",
"Name[sr@ijekavianlatin]": "Plasma tema",
"Name[sr@latin]": "Plasma tema",
"Name[sr]": "Плазма тема",
"Name[sv]": "Plasmatema",
"Name[uk]": "Тема Плазми",
"Name[x-test]": "xxPlasma Themexx",
"Name[zh_CN]": "Plasma 主题",
"ServiceTypes": [
"KPackage/PackageStructure"
],
"Version": "1"
},
},
"X-KDE-ParentApp": "org.kde.plasmashell"
}
}

View File

@ -2,14 +2,35 @@
"KPlugin": {
"Authors": [
{
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo"
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[sr@ijekavian]": "Арон Џ. Сајго",
"Name[sr@ijekavianlatin]": "Aron Dž. Sajgo",
"Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго",
"Name[x-test]": "xxAaron Seigoxx"
}
],
"Id": "Plasma/Applet",
"Name": "Plasmoid",
"ServiceTypes": [ "KPackage/PackageStructure" ],
],
"Id": "Plasma/Applet",
"Name": "Plasmoid",
"Name[ca@valencia]": "Plasmoide",
"Name[ca]": "Plasmoide",
"Name[es]": "Plasmoide",
"Name[it]": "Plasmoide",
"Name[pl]": "Plazmoid",
"Name[pt]": "Plasmóide",
"Name[ru]": "Виджет Plasma",
"Name[sr@ijekavian]": "Плазмоид",
"Name[sr@ijekavianlatin]": "Plazmoid",
"Name[sr@latin]": "Plazmoid",
"Name[sr]": "Плазмоид",
"Name[uk]": "Плазмоїд",
"Name[x-test]": "xxPlasmoidxx",
"Name[zh_CN]": "小部件",
"ServiceTypes": [
"KPackage/PackageStructure"
],
"Version": "1"
},
},
"X-KDE-ParentApp": "org.kde.plasmashell"
}
}