kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages 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-07-23 02:55:20 +00:00
parent f6aecd7ab8
commit c0962dd4c4
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

@ -8,6 +8,7 @@
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
"Description[cs]": "Obecné nastavení správce souborů",
"Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen",
"Description[en_GB]": "Configure general file manager settings",
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
"Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
"Description[fi]": "Tiedostonhallinnan yleisasetukset",
@ -41,6 +42,7 @@
"Name[ca]": "General",
"Name[cs]": "Obecné",
"Name[de]": "Allgemein",
"Name[en_GB]": "General",
"Name[es]": "General",
"Name[eu]": "Orokorra",
"Name[fi]": "Perusasetukset",

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

@ -8,6 +8,7 @@
"Description[ca]": "Configura la navegació del gestor de fitxers",
"Description[cs]": "Nastavení navigace správce souborů",
"Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung",
"Description[en_GB]": "Configure file manager navigation",
"Description[es]": "Configurar la navegación del gestor de archivos",
"Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
"Description[fi]": "Tiedostonhallinnan selausasetukset",

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

@ -8,6 +8,7 @@
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
"Description[cs]": "Nastavení režimů pohledu správce souborů",
"Description[de]": "Dateiverwaltungs-Ansichten einrichten",
"Description[en_GB]": "Configure file manager view modes",
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
"Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak",
"Description[fi]": "Tiedostonhallinnan näkymäasetukset",