Commit d4004303 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 d8842914
[General]
Name=Empty
Name[ca]=Buit
Name[ca@valencia]=Buit
Name[en_GB]=Empty
Name[es]=En blanco
Name[it]=Vuoto
Name[nb]=Tom
Name[nl]=Leeg
Name[pt]=Vazia
......@@ -13,8 +15,10 @@ Name[uk]=Порожній
Name[x-test]=xxEmptyxx
Comment=A project to fill with your ideas
Comment[ca]=Un projecte per omplir amb les vostres idees
Comment[ca@valencia]=Un projecte per omplir amb les vostres idees
Comment[en_GB]=A project to fill with your ideas
Comment[es]=Un proyecto para rellenar con sus ideas
Comment[it]=Un progetto da riempire con le tue idee
Comment[nl]=Een project om te vullen met uw ideeën
Comment[pt]=Um projecto a preencher com as suas ideias
Comment[sk]=Projekt na vyplnenie vašimi nápadmi
......
......@@ -61,4 +61,4 @@
"org.kdevelop.IStatus"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -48,4 +48,4 @@
"org.kdevelop.IStatus"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -57,4 +57,4 @@
"org.kdevelop.IDocumentationProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -58,4 +58,4 @@
"org.kdevelop.IDocumentationProviderProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@
],
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@
],
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@
"org.kdevelop.IExecutePlugin"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -64,4 +64,4 @@
"text/x-c++src",
"text/x-objcsrc"
]
}
\ No newline at end of file
}
......@@ -69,4 +69,4 @@
"text/x-csrc",
"text/x-c++src"
]
}
\ No newline at end of file
}
......@@ -52,4 +52,4 @@
],
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -40,4 +40,4 @@
"text/x-qml",
"application/javascript"
]
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@
],
"X-KDevelop-Mode": "NoGUI",
"X-KDevelop-ProjectBuilder": "CMake"
}
\ No newline at end of file
}
......@@ -58,4 +58,4 @@
"org.kdevelop.IMakeBuilder"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -56,4 +56,4 @@
"org.kdevelop.IProjectBuilder"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -58,4 +58,4 @@
],
"X-KDevelop-Mode": "NoGUI",
"X-KDevelop-ProjectBuilder": "QMake"
}
\ No newline at end of file
}
......@@ -69,4 +69,4 @@
"X-KDevelop-SupportedMimeTypes": [
"text/x-cmake"
]
}
\ No newline at end of file
}
......@@ -78,4 +78,4 @@
"X-KDevelop-SupportedMimeTypes": [
"text/x-cmake"
]
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@
"org.kdevelop.IBuildSystemManager"
],
"X-KDevelop-Mode": "NoGUI"
}
\ No newline at end of file
}
......@@ -69,4 +69,4 @@
"makefile.*"
],
"X-KDevelop-ProjectFilesFilterDescription": "Makefiles"
}
\ No newline at end of file
}
......@@ -62,4 +62,4 @@
"*.pro"
],
"X-KDevelop-ProjectFilesFilterDescription": "QMake Project Files"
}
\ No newline at end of file
}
......@@ -8,9 +8,11 @@
],
"Category": "Utilities",
"Description": "This plugin helps to obtain projects from GitHub",
"Description[ca@valencia]": "Este connector ajuda a obtindre els projectes des de GitHub",
"Description[ca]": "Aquest connector ajuda a obtenir els projectes des de GitHub",
"Description[es]": "Este complemento le ayuda a obtener proyectos de GitHub",
"Description[fr]": "Ce module aide à obtenir des projets depuis GitHub",
"Description[it]": "Questa estensione consente di ottenere progetti da GitHub",
"Description[nl]": "Deze plug-in helpt om projecten uit Github te verkrijgen",
"Description[pt]": "Este 'plugin' ajuda a obter projectos do GitHub",
"Description[sk]": "Tento modul pomáha získavať projekty z GitHub",
......@@ -22,9 +24,11 @@
"Id": "kdevghprovider",
"License": "GPL",
"Name": "GitHub Provider",
"Name[ca@valencia]": "Proveïdor de GitHub",
"Name[ca]": "Proveïdor de GitHub",
"Name[es]": "Proveedor de GitHub",
"Name[fr]": "Fournisseur GitHub",
"Name[it]": "Fornitore GitHub",
"Name[nl]": "Github-leverancier",
"Name[pt]": "Fornecedor do GitHub",
"Name[sk]": "Poskytovateľ GitHub",
......@@ -40,4 +44,4 @@
"org.kdevelop.IProjectProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -65,4 +65,4 @@
"org.kdevelop.IProjectProvider"
],
"X-KDevelop-Mode": "GUI"
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@
"X-KDevelop-Category": "Global",
"X-KDevelop-Mode": "GUI",
"X-KDevelop-Version": "@KDEV_PLUGIN_VERSION@"
}
\ 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