kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +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-06-06 01:43:37 +00:00
parent 29acb196ab
commit 579b38050d
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

@ -17,6 +17,7 @@
"Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
"Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
"Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere",
"Description[ru]": "Настройка основных параметров диспетчера файлов",
"Description[sl]": "Postavi splošne nastavitve upravljalnika datotek",
"Description[sv]": "Anpassa filhanterarens allmänna inställningar",
"Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
@ -44,6 +45,7 @@
"Name[pt]": "Geral",
"Name[pt_BR]": "Geral",
"Name[ro]": "Generale",
"Name[ru]": "Основные параметры",
"Name[sl]": "Splošno",
"Name[sv]": "Allmänt",
"Name[ta]": "பொதுவானவை",

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

@ -17,6 +17,7 @@
"Description[pt]": "Configurar a navegação do gestor de ficheiros",
"Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
"Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
"Description[ru]": "Настройка навигации в диспетчере файлов",
"Description[sl]": "Postavi krmarjenje v upravljalniku datotek",
"Description[sv]": "Anpassa filhanterarens navigering",
"Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்",

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

@ -17,6 +17,7 @@
"Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
"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[ru]": "Настройка режимов просмотра папок в диспетчере файлов",
"Description[sl]": "Postavi načine prikaza upravljalnika datotek",
"Description[sv]": "Anpassa filhanterarens visningslägen",
"Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்",