mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
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:
parent
7153234e46
commit
c88ce580e6
|
@ -1,8 +1,22 @@
|
|||
{
|
||||
"KPlugin": {
|
||||
"Description": "Configure general file manager settings",
|
||||
"Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers",
|
||||
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
|
||||
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
|
||||
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
||||
"Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
|
||||
"Description[uk]": "Налаштувати загальні параметри менеджера файлів",
|
||||
"Description[x-test]": "xxConfigure general file manager settingsxx",
|
||||
"Icon": "system-file-manager",
|
||||
"Name": "General",
|
||||
"Name[ca@valencia]": "General",
|
||||
"Name[ca]": "General",
|
||||
"Name[es]": "General",
|
||||
"Name[nl]": "Algemeen",
|
||||
"Name[tr]": "Genel",
|
||||
"Name[uk]": "Загальне",
|
||||
"Name[x-test]": "xxGeneralxx",
|
||||
"ServiceTypes": [
|
||||
"KCModule"
|
||||
]
|
||||
|
|
|
@ -1,6 +1,13 @@
|
|||
{
|
||||
"KPlugin": {
|
||||
"Description": "Configure file manager navigation",
|
||||
"Description[ca@valencia]": "Configura la navegació del gestor de fitxers",
|
||||
"Description[ca]": "Configura la navegació del gestor de fitxers",
|
||||
"Description[es]": "Configurar la navegación del gestor de archivos",
|
||||
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
||||
"Description[tr]": "Dosya yöneticisi dolaşımını yapılandır",
|
||||
"Description[uk]": "Налаштувати навігацію у менеджері файлів",
|
||||
"Description[x-test]": "xxConfigure file manager navigationxx",
|
||||
"Icon": "preferences-desktop-navigation",
|
||||
"Name": "Navigation",
|
||||
"Name[ar]": "التّنقّل",
|
||||
|
|
|
@ -1,6 +1,13 @@
|
|||
{
|
||||
"KPlugin": {
|
||||
"Description": "Configure file manager view modes",
|
||||
"Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers",
|
||||
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
|
||||
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
|
||||
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
||||
"Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır",
|
||||
"Description[uk]": "Налаштувати режими перегляду менеджера файлів",
|
||||
"Description[x-test]": "xxConfigure file manager view modesxx",
|
||||
"Icon": "preferences-desktop-icons",
|
||||
"Name": "View Modes",
|
||||
"Name[ar]": "أوضاع المنظور",
|
||||
|
|
Loading…
Reference in a new issue