kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2022-05-04 01:46:27 +00:00
parent d958aa57d8
commit 506cdf329c
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/kcm/kcmdolphingeneral.json
View file

@ -9,6 +9,7 @@
"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[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
"Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere",
"Description[sl]": "Postavi splošne nastavitve upravljalnika datotek",
"Description[sv]": "Anpassa filhanterarens allmänna inställningar",
@ -28,6 +29,7 @@
"Name[fr]": "Général",
"Name[it]": "Generale",
"Name[nl]": "Algemeen",
"Name[pt_BR]": "Geral",
"Name[ro]": "Generale",
"Name[sl]": "Splošno",
"Name[sv]": "Allmänt",

1
src/settings/kcm/kcmdolphinnavigation.json
View file

@ -9,6 +9,7 @@
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
"Description[it]": "Configura la navigazione col gestore dei file",
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
"Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
"Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
"Description[sl]": "Postavi krmarjenje v upravljalniku datotek",
"Description[sv]": "Anpassa filhanterarens navigering",

1
src/settings/kcm/kcmdolphinviewmodes.json
View file

@ -9,6 +9,7 @@
"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[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",
"Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere",
"Description[sl]": "Postavi načine prikaza upravljalnika datotek",
"Description[sv]": "Anpassa filhanterarens visningslägen",