From c2be6f09fd4e5d34a601912b7ee8944d93229a55 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 15 Nov 2018 07:53:15 +0100 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" --- lookandfeel/metadata.desktop | 2 +- shell/org.kde.plasmashell.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 88d4d511d..88378ceed 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -55,7 +55,7 @@ Keywords[fi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shut Keywords[fr]=bureau;espace de travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation; Keywords[gl]=Escritorio;Espazo de traballo;Aparencia;Aparencia e Comportamento;Saír;Trancar;Bloquear;Suspender;Apagar;Hibernar; Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;Felfüggesztés;Leállítás;Hibernálás; -Keywords[id]=Desktop;Ruang Kerja;Penampilan;Look and Feel;Logout;Kunci;Suspensi;Matikan;Hibernasi; +Keywords[id]=Desktop;Workspace;Penampilan;Look and Feel;Logout;Kunci;Suspensi;Matikan;Hibernasi; Keywords[is]=skjáborð;vinnusvæði;útlit;ásýnd og hegðun;Útskráning;Læsing;setja í bið;slökkva;svæfa; Keywords[it]=desktop;spazio di lavoro;aspetto;uscita;blocco;sospensione;spegnimento;ibernazione; Keywords[ja]=デスクトップ;ワークスペース;外観;外観と挙動;ログアウト;ロック;サスペンド;シャットダウン;休止状態; diff --git a/shell/org.kde.plasmashell.desktop b/shell/org.kde.plasmashell.desktop index 1c191611c..6c90794e0 100644 --- a/shell/org.kde.plasmashell.desktop +++ b/shell/org.kde.plasmashell.desktop @@ -22,7 +22,7 @@ Name[he]=תחנת עבודה של שולחן העבודה Plasma Name[hr]=Plasma radno okruženje Name[hu]=Plazma asztali munkaterület Name[ia]=Spatio de labor de scriptorio de Plasma -Name[id]=Ruang Kerja Desktop Plasma +Name[id]=Workspace Desktop Plasma Name[is]=Vinnurýmd Plasma skjáborðs Name[it]=Spazio di lavoro del desktop di Plasma Name[ja]=Plasma デスクトップワークスペース