From 5f410eee07d8f8b6d4a4b7dda3564c801ed6a233 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 16 Sep 2022 01:46:22 +0000 Subject: [PATCH] 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" --- menu/desktop/kf5-utilities-accessibility.directory | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menu/desktop/kf5-utilities-accessibility.directory b/menu/desktop/kf5-utilities-accessibility.directory index 6e9e47b54..9a8dc81d6 100644 --- a/menu/desktop/kf5-utilities-accessibility.directory +++ b/menu/desktop/kf5-utilities-accessibility.directory @@ -44,7 +44,7 @@ Name[id]=Aksesibilitas Name[is]=Auðveldað aðgengi Name[it]=Accessibilità Name[ja]=アクセシビリティ -Name[ka]=_დამხმარე საშუალებები +Name[ka]=წვდომადობა Name[kk]=Арнайы мүмкіндіктер Name[km]=មធ្យោបាយ​ងាយស្រួល Name[kn]=ನಿಲುಕಣೆ (ಆಕ್ಸೆಸಿಬಿಲಿಟಿ) @@ -139,7 +139,7 @@ Comment[id]=Aksesibilitas Comment[is]=Auðveldað aðgengi Comment[it]=Accessibilità Comment[ja]=アクセシビリティ -Comment[ka]=_დამხმარე საშუალებები +Comment[ka]=წვდომადობა Comment[kk]=Арнайы мүмкіндіктер Comment[km]=មធ្យោបាយ​ងាយស្រួល Comment[kn]=ನಿಲುಕಣೆ (ಆಕ್ಸೆಸಿಬಿಲಿಟಿ)