┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-05-16 01:50:33 +0000
committerl10n daemon script <[email protected]>2022-05-16 01:50:33 +0000
commit0b27270beec7a9b8309322b0c869e71dde30f3d2 (patch)
tree00ec195e1694f13f14867e6b50f7b88400ebbe84 /src/settings/kcm/kcmdolphingeneral.json
parent2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d (diff)
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.json')
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index bb5b5d10b..8a4c602a1 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -11,6 +11,7 @@
"Description[it]": "Configura le impostazioni generali del gestore dei file",
"Description[ko]": "일반 파일 관리자 설정",
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
+ "Description[pl]": "Ustawienia ogólne zarządzania plikami",
"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",
@@ -35,6 +36,7 @@
"Name[it]": "Generale",
"Name[ko]": "일반",
"Name[nl]": "Algemeen",
+ "Name[pl]": "Ogólne",
"Name[pt]": "Geral",
"Name[pt_BR]": "Geral",
"Name[ro]": "Generale",