GIT_SILENT made messages (after extraction)

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"
2026-07-03 16:31:18 -07:00 · 2017-11-04 05:24:10 +01:00 · 2017-10-11 10:17:37 +02:00
3 changed files with 4 additions and 2 deletions
--- a/framebuffers/xcb/krfb_framebuffer_xcb.desktop
+++ b/framebuffers/xcb/krfb_framebuffer_xcb.desktop
@@ -17,7 +17,7 @@ Comment[eu]=X11 XDamage/XShm  oinarritutako KRfb-ren irteerako bideoa.
 Comment[fi]=X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.
 Comment[fr]=Sortie vidéo fondée sur X11 « XDamage / XShm » pour Krfb.
 Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar X11 XDamage/XShm
-Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb.
+Comment[gl]=Framebuffer baseado en X11 XDamage/Xshm para XRfb.
 Comment[hr]=Međuspreminik okvira baziran na X11 XDamage/XShm za KRfb.
 Comment[hu]=X11 XDamage/XShm-alapú framebuffer a Krfb-hez.
 Comment[ia]=Framebuffer basate sur X11 XDamage/XShm per KRfb.
--- a/framebuffers/xcb/krfb_framebuffer_xcb.json
+++ b/framebuffers/xcb/krfb_framebuffer_xcb.json
@@ -13,7 +13,7 @@
        "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver",
        "Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
        "Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.",
-        "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.",
+        "Description[gl]": "Framebuffer baseado en X11 XDamage/Xshm para XRfb.",
        "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.",
        "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.",
        "Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.",
--- a/krfb/org.kde.krfb.appdata.xml
+++ b/krfb/org.kde.krfb.appdata.xml
@@ -18,6 +18,7 @@
  <name xml:lang="nl">Krfb</name>
  <name xml:lang="pl">Krfb</name>
  <name xml:lang="pt">Krfb</name>
+  <name xml:lang="pt-BR">Krfb</name>
  <name xml:lang="sk">Krfb</name>
  <name xml:lang="sl">Krfb</name>
  <name xml:lang="sr">КРФБ</name>
@@ -44,6 +45,7 @@
  <summary xml:lang="nl">Bureaublad delen</summary>
  <summary xml:lang="pl">Współdzielenie pulpitu</summary>
  <summary xml:lang="pt">Partilha do ecrã</summary>
+  <summary xml:lang="pt-BR">Compartilhamento de tela</summary>
  <summary xml:lang="sk">Zdieľanie pracovnej plochy</summary>
  <summary xml:lang="sl">Souporaba namizja</summary>
  <summary xml:lang="sr">Дељење површи</summary>
Author	SHA1	Message	Date
l10n daemon script	7968886f15	GIT_SILENT made messages (after extraction)	2017-11-04 05:24:10 +01:00
l10n daemon script	786fb279f1	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"	2017-10-11 10:17:37 +02:00