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 2023-03-02 02:25:05 +00:00
parent 74ecb5b9b4
commit 6adbb73b99
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[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
"Description[fi]": "Tiedostonhallinnan yleisasetukset", "Description[fi]": "Tiedostonhallinnan yleisasetukset",
"Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
"Description[hi]": "साधारण फ़ाइल प्रबंधक सेटिंग्स विन्यस्त करें",
"Description[ia]": "Configura preferentias del gerente general de file", "Description[ia]": "Configura preferentias del gerente general de file",
"Description[id]": "Konfigurasikan pengaturan pengelola file umum", "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
"Description[ie]": "Configurar li parametres del gerente de files", "Description[ie]": "Configurar li parametres del gerente de files",
@ -61,6 +62,7 @@
"Name[eu]": "Orokorra", "Name[eu]": "Orokorra",
"Name[fi]": "Perusasetukset", "Name[fi]": "Perusasetukset",
"Name[fr]": "Général", "Name[fr]": "Général",
"Name[hi]": "साधारण",
"Name[ia]": "General", "Name[ia]": "General",
"Name[id]": "Umum", "Name[id]": "Umum",
"Name[ie]": "General", "Name[ie]": "General",

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

@ -17,6 +17,7 @@
"Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
"Description[fi]": "Tiedostonhallinnan selausasetukset", "Description[fi]": "Tiedostonhallinnan selausasetukset",
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
"Description[hi]": "फ़ाइल प्रबंधक संचालन विन्यस्त करें",
"Description[ia]": "Configura navigation del gerente de file", "Description[ia]": "Configura navigation del gerente de file",
"Description[id]": "Konfigurasikan navigasi pengelola file", "Description[id]": "Konfigurasikan navigasi pengelola file",
"Description[ie]": "Configurar li navigation del gerente de files", "Description[ie]": "Configurar li navigation del gerente de files",

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

@ -17,6 +17,7 @@
"Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak",
"Description[fi]": "Tiedostonhallinnan näkymäasetukset", "Description[fi]": "Tiedostonhallinnan näkymäasetukset",
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
"Description[hi]": "फ़ाइल प्रबंधक दृश्य मोड विन्यस्त करें",
"Description[ia]": "Configura le modos de vista del gerente de file", "Description[ia]": "Configura le modos de vista del gerente de file",
"Description[id]": "Konfigurasikan mode tampilan pengelola file", "Description[id]": "Konfigurasikan mode tampilan pengelola file",
"Description[ie]": "Configurar li modes de vise del gerente de files", "Description[ie]": "Configurar li modes de vise del gerente de files",