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"
5 years ago · cf9c60a0c0
parent 2e473a21fb
commit cf9c60a0c0
8 changed files with 23 additions and 3 deletions
--- a/src/effects/sessionquit/package/metadata.desktop
+++ b/src/effects/sessionquit/package/metadata.desktop
@ -37,7 +37,7 @@ Comment=Keep the desktop background alive during logout until the end
 Comment[az]=Seansdan çıxışda sona qədər İş Masası fon şəklinin saxlanılması
 Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins el final
 Comment[da]=Hold skrivebordsbaggrunden i live under log ud helt til sidst
-Comment[de]=Beim Abmelden der Hintergrund der Arbeitsfläche bis zum Schluss behalten
+Comment[de]=Beim Abmelden den Hintergrund der Arbeitsfläche bis zum Schluss behalten
 Comment[en_GB]=Keep the desktop background alive during logout until the end
 Comment[es]=Mantener el fondo del escritorio activo durante el cierre de sesión hasta el final
 Comment[et]=Töölaua taust hoitakse väljalogimisel alles kuni lõpuni
--- a/src/effects/translucency/package/metadata.desktop
+++ b/src/effects/translucency/package/metadata.desktop
@ -93,7 +93,7 @@ Comment[ca@valencia]=Torna translúcides les finestres en diverses condicions
 Comment[cs]=Zobrazuje okna různě průhledná
 Comment[csb]=Robi òkna przezérnëmi przë ùstalonëch reglach
 Comment[da]=Gør vinduer gennemsigtige under forskellige omstændigheder
-Comment[de]=Lässt Fenster unter festgelegten Bedingungen durchscheinen.
+Comment[de]=Lässt Fenster unter festgelegten Bedingungen durchscheinen
 Comment[el]=Εμφάνιση ημιδιαφανών παραθύρων σε διάφορες περιπτώσεις
 Comment[en_GB]=Make windows translucent under different conditions
 Comment[es]=Hace la ventana translúcida en distintas condiciones
--- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
+++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
@ -9,8 +9,10 @@
                "Name[cs]": "Demitrius Belai",
                "Name[en_GB]": "Demitrius Belai",
                "Name[es]": "Demitrius Belai",
+                "Name[fr]": "Demitrius Belai",
                "Name[ko]": "Demitrius Belai",
                "Name[nl]": "Demitrius Belai",
+                "Name[pl]": "Demitrius Belai",
                "Name[sv]": "Demitrius Belai",
                "Name[uk]": "Demitrius Belai",
                "Name[vi]": "Demitrius Belai",
@ -24,8 +26,10 @@
        "Name[cs]": "KWin Aurorae",
        "Name[en_GB]": "KWin Aurorae",
        "Name[es]": "KWin Aurorae",
+        "Name[fr]": "KWin Aurorae",
        "Name[ko]": "KWin Aurorae",
        "Name[nl]": "KWin Aurorae",
+        "Name[pl]": "KWin Aurorae",
        "Name[sv]": "KWin Aurorae",
        "Name[uk]": "KWin Aurorae",
        "Name[vi]": "Aurorae của KWin",
--- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
+++ b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
@ -9,8 +9,10 @@
                "Name[cs]": "Demitrius Belai",
                "Name[en_GB]": "Demitrius Belai",
                "Name[es]": "Demitrius Belai",
+                "Name[fr]": "Demitrius Belai",
                "Name[ko]": "Demitrius Belai",
                "Name[nl]": "Demitrius Belai",
+                "Name[pl]": "Demitrius Belai",
                "Name[sv]": "Demitrius Belai",
                "Name[uk]": "Demitrius Belai",
                "Name[vi]": "Demitrius Belai",
@ -24,8 +26,10 @@
        "Name[cs]": "Dekorace KWin",
        "Name[en_GB]": "KWin Decoration",
        "Name[es]": "Decoración de KWin",
+        "Name[fr]": "Décorations pour KWin",
        "Name[ko]": "KWin 장식",
        "Name[nl]": "KWin-decoraties",
+        "Name[pl]": "Wygląd KWin",
        "Name[sv]": "Kwin-dekoration",
        "Name[uk]": "Обрамлення вікон KWin",
        "Name[vi]": "Trang trí KWin",
--- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
+++ b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
@ -9,8 +9,10 @@
                "Name[cs]": "Vlad Zahorodnii",
                "Name[en_GB]": "Vlad Zahorodnii",
                "Name[es]": "Vlad Zahorodnii",
+                "Name[fr]": "Vlad Zahorodnii",
                "Name[ko]": "Vlad Zahorodnii",
                "Name[nl]": "Vlad Zahorodnii",
+                "Name[pl]": "Vlad Zahorodnii",
                "Name[sv]": "Vlad Zahorodnii",
                "Name[uk]": "Влад Загородній",
                "Name[vi]": "Vlad Zahorodnii",
@ -24,8 +26,10 @@
        "Name[cs]": "Efekt KWinu",
        "Name[en_GB]": "KWin Effect",
        "Name[es]": "Efecto de KWin",
+        "Name[fr]": "Effet pour KWin",
        "Name[ko]": "KWin 효과",
        "Name[nl]": "KWin-effect",
+        "Name[pl]": "Efekt KWin",
        "Name[sv]": "Kwin-effekt",
        "Name[uk]": "Ефект KWin",
        "Name[vi]": "Hiệu ứng KWin",
--- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
+++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
@ -9,8 +9,10 @@
                "Name[cs]": "Marco Martin",
                "Name[en_GB]": "Marco Martin",
                "Name[es]": "Marco Martin",
+                "Name[fr]": "Marco Martin",
                "Name[ko]": "Marco Martin",
                "Name[nl]": "Marco Martin",
+                "Name[pl]": "Marco Martin",
                "Name[sv]": "Marco Martin",
                "Name[uk]": "Marco Martin",
                "Name[vi]": "Marco Martin",
@ -24,8 +26,10 @@
        "Name[cs]": "Skript KWinu",
        "Name[en_GB]": "KWin Script",
        "Name[es]": "Guion de KWin",
+        "Name[fr]": "Script pour KWin",
        "Name[ko]": "KWin 스크립트",
        "Name[nl]": "KWin-script",
+        "Name[pl]": "Skrypt KWin",
        "Name[sv]": "Kwin-skript",
        "Name[uk]": "Скрипт KWin",
        "Name[vi]": "Kịch bản KWin",
--- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
+++ b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
@ -9,8 +9,10 @@
                "Name[cs]": "Marco Martin",
                "Name[en_GB]": "Marco Martin",
                "Name[es]": "Marco Martin",
+                "Name[fr]": "Marco Martin",
                "Name[ko]": "Marco Martin",
                "Name[nl]": "Marco Martin",
+                "Name[pl]": "Marco Martin",
                "Name[sv]": "Marco Martin",
                "Name[uk]": "Marco Martin",
                "Name[vi]": "Marco Martin",
@ -24,8 +26,10 @@
        "Name[cs]": "Přepínač oken KWin",
        "Name[en_GB]": "KWin Window Switcher",
        "Name[es]": "Selector de ventanas de KWin",
+        "Name[fr]": "Sélecteur de fenêtres de KWin",
        "Name[ko]": "KWin 창 전환기",
        "Name[nl]": "KWin-vensterwisselaar",
+        "Name[pl]": "Przełącznik okien KWin",
        "Name[sv]": "Kwin-fönsterbyte",
        "Name[uk]": "Перемикач вікон KWin",
        "Name[vi]": "Trình chuyển cửa sổ KWin",
--- a/src/plugins/krunner-integration/kwin-runner-windows.desktop
+++ b/src/plugins/krunner-integration/kwin-runner-windows.desktop
@ -33,7 +33,7 @@ Comment=List windows and desktops and switch them
 Comment[az]=Pəncərələrin, İş Masalarının siyahısı və onlar arası keçid
 Comment[ca]=Llista finestres i escriptoris, i canvia entre ells
 Comment[cs]=Seznam oken a ploch k přepínání
-Comment[de]=Listet Fenster und Arbeitsflächen auf und wechselt zwischen ihnen.
+Comment[de]=Listet Fenster und Arbeitsflächen auf und wechselt zwischen ihnen
 Comment[en_GB]=List windows and desktops and switch them
 Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
 Comment[eu]=Leihoak eta mahaigainak zerrendatzea eta haien artean aldatzea