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
776d746c67
commit
1a8be1544d
|
@ -6,7 +6,9 @@
|
|||
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
|
||||
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
|
||||
"Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
|
||||
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
||||
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
||||
"Description[sl]": "Postavi splošne nastavitve upravljalnika datotek",
|
||||
"Description[sv]": "Anpassa filhanterarens allmänna inställningar",
|
||||
"Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
|
||||
"Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
|
||||
|
@ -20,7 +22,9 @@
|
|||
"Name[ca]": "General",
|
||||
"Name[es]": "General",
|
||||
"Name[fr]": "Général",
|
||||
"Name[it]": "Generale",
|
||||
"Name[nl]": "Algemeen",
|
||||
"Name[sl]": "Splošno",
|
||||
"Name[sv]": "Allmänt",
|
||||
"Name[ta]": "பொதுவானவை",
|
||||
"Name[tr]": "Genel",
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
"Description[ca]": "Configura la navegació del gestor de fitxers",
|
||||
"Description[es]": "Configurar la navegación del gestor de archivos",
|
||||
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
|
||||
"Description[it]": "Configura la navigazione col gestore dei file",
|
||||
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
||||
"Description[sl]": "Postavi krmarjenje v upravljalniku datotek",
|
||||
"Description[sv]": "Anpassa filhanterarens navigering",
|
||||
"Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்",
|
||||
"Description[tr]": "Dosya yöneticisi dolaşımını yapılandır",
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
|
||||
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
|
||||
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
|
||||
"Description[it]": "Configura le viste del gestore dei file",
|
||||
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
||||
"Description[sl]": "Postavi načine prikaza upravljalnika datotek",
|
||||
"Description[sv]": "Anpassa filhanterarens visningslägen",
|
||||
"Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்",
|
||||
"Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır",
|
||||
|
|
Loading…
Reference in a new issue